hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-03-10 12:04:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

always state encoding when opening files in text mode

Browse Source 
Also applies to Path.write_text().
This commit is contained in:
Sarah Hoffmann
2022-05-10 15:36:29 +02:00
parent adeebec32a
commit 7e70e5f503
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nominatim/config.py
View File

@@ -187,7 +187,7 @@ class Configuration:
if configfile.suffix in ('.yaml', '.yml'): if configfile.suffix in ('.yaml', '.yml'):
result = self._load_from_yaml(configfile) result = self._load_from_yaml(configfile)
elif configfile.suffix == '.json': elif configfile.suffix == '.json':
with configfile.open('r') as cfg: with configfile.open('r', encoding='utf-8') as cfg:
result = json.load(cfg) result = json.load(cfg)
else: else:
raise UsageError(f"Config file '{configfile}' has unknown format.") raise UsageError(f"Config file '{configfile}' has unknown format.")

2
nominatim/tokenizer/icu_tokenizer.py
View File

@@ -187,7 +187,7 @@ class LegacyICUTokenizer(AbstractTokenizer):
@define('CONST_Max_Word_Frequency', 10000000); @define('CONST_Max_Word_Frequency', 10000000);
@define('CONST_Term_Normalization_Rules', "{self.loader.normalization_rules}"); @define('CONST_Term_Normalization_Rules', "{self.loader.normalization_rules}");
@define('CONST_Transliteration', "{self.loader.get_search_rules()}"); @define('CONST_Transliteration', "{self.loader.get_search_rules()}");
require_once('{phpdir}/tokenizer/icu_tokenizer.php');""")) require_once('{phpdir}/tokenizer/icu_tokenizer.php');"""), encoding='utf-8')
def _save_config(self): def _save_config(self):

2
nominatim/tokenizer/legacy_tokenizer.py
View File

@@ -255,7 +255,7 @@ class LegacyTokenizer(AbstractTokenizer):
@define('CONST_Max_Word_Frequency', {0.MAX_WORD_FREQUENCY}); @define('CONST_Max_Word_Frequency', {0.MAX_WORD_FREQUENCY});
@define('CONST_Term_Normalization_Rules', "{0.TERM_NORMALIZATION}"); @define('CONST_Term_Normalization_Rules', "{0.TERM_NORMALIZATION}");
require_once('{0.lib_dir.php}/tokenizer/legacy_tokenizer.php'); require_once('{0.lib_dir.php}/tokenizer/legacy_tokenizer.php');
""".format(config))) """.format(config)), encoding='utf-8')
def _init_db_tables(self, config): def _init_db_tables(self, config):