Merge pull request #3172 from lonvia/query-timeout

[nominatim.git] / nominatim / tokenizer / token_analysis / generic_mutation.py

diff --git a/nominatim/tokenizer/token_analysis/generic_mutation.py b/nominatim/tokenizer/token_analysis/generic_mutation.py
index d23d5cd46f7dbf9955588a19995ebbfbbe6c7067..612f558a46ae290fd383d66ecf4a34643d478836 100644 (file)
--- a/nominatim/tokenizer/token_analysis/generic_mutation.py
+++ b/nominatim/tokenizer/token_analysis/generic_mutation.py
@@ -7,6 +7,7 @@
 """
 Creator for mutation variants for the generic token analysis.
 """
 """
 Creator for mutation variants for the generic token analysis.
 """

+from typing import Sequence, Iterable, Iterator, Tuple

 import itertools
 import logging
 import re
 import itertools
 import logging
 import re


@@ -15,18 +16,18 @@ from nominatim.errors import UsageError
 
 LOG = logging.getLogger()
 
 
 LOG = logging.getLogger()
 

-def _zigzag(outer, inner):
+def _zigzag(outer: Iterable[str], inner: Iterable[str]) -> Iterator[str]:

     return itertools.chain.from_iterable(itertools.zip_longest(outer, inner, fillvalue=''))
 
 
 class MutationVariantGenerator:
     """ Generates name variants by applying a regular expression to the name
         and replacing it with one or more variants. When the regular expression
     return itertools.chain.from_iterable(itertools.zip_longest(outer, inner, fillvalue=''))
 
 
 class MutationVariantGenerator:
     """ Generates name variants by applying a regular expression to the name
         and replacing it with one or more variants. When the regular expression

-        matches more than once, each occurence is replaced with all replacement
+        matches more than once, each occurrence is replaced with all replacement

         patterns.
     """
 
         patterns.
     """
 

-    def __init__(self, pattern, replacements):
+    def __init__(self, pattern: str, replacements: Sequence[str]):

         self.pattern = re.compile(pattern)
         self.replacements = replacements
 
         self.pattern = re.compile(pattern)
         self.replacements = replacements
 


@@ -36,7 +37,7 @@ class MutationVariantGenerator:
             raise UsageError("Bad mutation pattern in configuration.")
 
 
             raise UsageError("Bad mutation pattern in configuration.")
 
 

-    def generate(self, names):
+    def generate(self, names: Iterable[str]) -> Iterator[str]:

         """ Generator function for the name variants. 'names' is an iterable
             over a set of names for which the variants are to be generated.
         """
         """ Generator function for the name variants. 'names' is an iterable
             over a set of names for which the variants are to be generated.
         """


@@ -49,7 +50,7 @@ class MutationVariantGenerator:
                     yield ''.join(_zigzag(parts, seps))
 
 
                     yield ''.join(_zigzag(parts, seps))
 
 

-    def _fillers(self, num_parts):
+    def _fillers(self, num_parts: int) -> Iterator[Tuple[str, ...]]:

         """ Returns a generator for strings to join the given number of string
             parts in all possible combinations.
         """
         """ Returns a generator for strings to join the given number of string
             parts in all possible combinations.
         """