X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/0192a7af96d32faf5dd319469d376bf4140dfcbb..3bf3b894eaddd4f17f7e92353af6b2aa6200ab20:/nominatim/tokenizer/token_analysis/config_variants.py?ds=sidebyside diff --git a/nominatim/tokenizer/token_analysis/config_variants.py b/nominatim/tokenizer/token_analysis/config_variants.py index 59ceeb22..067c4b5b 100644 --- a/nominatim/tokenizer/token_analysis/config_variants.py +++ b/nominatim/tokenizer/token_analysis/config_variants.py @@ -66,7 +66,7 @@ class _VariantMaker: """ parts = re.split(r'(\|)?([=-])>', rule) if len(parts) != 4: - raise UsageError("Syntax error in variant rule: " + rule) + raise UsageError(f"Syntax error in variant rule: {rule}") decompose = parts[1] is None src_terms = [self._parse_variant_word(t) for t in parts[0].split(',')] @@ -89,7 +89,7 @@ class _VariantMaker: name = name.strip() match = re.fullmatch(r'([~^]?)([^~$^]*)([~$]?)', name) if match is None or (match.group(1) == '~' and match.group(3) == '~'): - raise UsageError("Invalid variant word descriptor '{}'".format(name)) + raise UsageError(f"Invalid variant word descriptor '{name}'") norm_name = self.norm.transliterate(match.group(2)).strip() if not norm_name: return None