reduce from 3 to 2 packages

src/nominatim_db/tokenizer/token_analysis/base.py

@@ -9,7 +9,7 @@ Common data types and protocols for analysers.
 """
 from typing import Mapping, List, Any
 
-from nominatim_core.typing import Protocol
+from ...typing import Protocol
 from ...data.place_name import PlaceName
 
 class Analyzer(Protocol):

src/nominatim_db/tokenizer/token_analysis/config_variants.py

@@ -12,8 +12,8 @@ from collections import defaultdict
 import itertools
 import re
 
-from nominatim_core.config import flatten_config_list
-from nominatim_core.errors import UsageError
+from ...config import flatten_config_list
+from ...errors import UsageError
 
 class ICUVariant(NamedTuple):
     """ A single replacement rule for variant creation.

src/nominatim_db/tokenizer/token_analysis/generic.py

@@ -12,7 +12,7 @@ import itertools
 
 import datrie
 
-from nominatim_core.errors import UsageError
+from ...errors import UsageError
 from ...data.place_name import PlaceName
 from .config_variants import get_variant_config
 from .generic_mutation import MutationVariantGenerator

src/nominatim_db/tokenizer/token_analysis/generic_mutation.py

@@ -12,7 +12,7 @@ import itertools
 import logging
 import re
 
-from nominatim_core.errors import UsageError
+from ...errors import UsageError
 
 LOG = logging.getLogger()