Merge pull request #3542 from lonvia/remove-legacy-tokenizer

[nominatim.git] / src / nominatim_db / config.py

diff --git a/src/nominatim_db/config.py b/src/nominatim_db/config.py
index 2cab02377593a6ce71286199105faf49e12732ff..b220b5c7844ab7ef20756d68c9e8e0033e47ec72 100644 (file)
--- a/src/nominatim_db/config.py
+++ b/src/nominatim_db/config.py
@@ -61,7 +61,7 @@ class Configuration:
 
     def __init__(self, project_dir: Optional[Union[Path, str]],
                  environ: Optional[Mapping[str, str]] = None) -> None:
 
     def __init__(self, project_dir: Optional[Union[Path, str]],
                  environ: Optional[Mapping[str, str]] = None) -> None:

-        self.environ = environ or os.environ
+        self.environ = os.environ if environ is None else environ

         self.config_dir = paths.CONFIG_DIR
         self._config = dotenv_values(str(self.config_dir / 'env.defaults'))
         if project_dir is not None:
         self.config_dir = paths.CONFIG_DIR
         self._config = dotenv_values(str(self.config_dir / 'env.defaults'))
         if project_dir is not None:


@@ -72,9 +72,7 @@ class Configuration:
             self.project_dir = None
 
         class _LibDirs:
             self.project_dir = None
 
         class _LibDirs:

-            module: Path

             osm2pgsql: Path
             osm2pgsql: Path

-            php = paths.PHPLIB_DIR

             sql = paths.SQLLIB_DIR
             data = paths.DATA_DIR
 
             sql = paths.SQLLIB_DIR
             data = paths.DATA_DIR