X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/abdba5fdc7b6313f5dad4e2692344482359e5ce9..c8fb25201a304f504c0749384740405f172b2fb6:/nominatim/tools/special_phrases.py diff --git a/nominatim/tools/special_phrases.py b/nominatim/tools/special_phrases.py index 9d0259dc..f4eec260 100644 --- a/nominatim/tools/special_phrases.py +++ b/nominatim/tools/special_phrases.py @@ -3,20 +3,21 @@ """ import logging import os +from os.path import isfile from pathlib import Path import re import subprocess import json -from os.path import isfile + from icu import Transliterator from psycopg2.sql import Identifier, Literal, SQL + from nominatim.tools.exec_utils import get_url from nominatim.errors import UsageError LOG = logging.getLogger() class SpecialPhrasesImporter(): # pylint: disable-msg=too-many-instance-attributes - # pylint: disable-msg=too-few-public-methods """ Class handling the process of special phrases importations. """ @@ -116,7 +117,7 @@ class SpecialPhrasesImporter(): if self.config.PHRASE_CONFIG: settings_path = self._convert_php_settings_if_needed(self.config.PHRASE_CONFIG) - with open(settings_path, "r") as json_settings: + with settings_path.open("r") as json_settings: settings = json.load(json_settings) return settings['blackList'], settings['whiteList'] @@ -152,7 +153,7 @@ class SpecialPhrasesImporter(): type_matchs = self.sanity_check_pattern.findall(phrase_type) class_matchs = self.sanity_check_pattern.findall(phrase_class) - if len(class_matchs) < 1 or len(type_matchs) < 1: + if not class_matchs or not type_matchs: LOG.warning("Bad class/type for language %s: %s=%s. It will not be imported", lang, phrase_class, phrase_type) return False