Merge pull request #2276 from lonvia/port-country-code-creation-to-python

[nominatim.git] / nominatim / config.py

diff --git a/nominatim/config.py b/nominatim/config.py
index 564884f612a40d97eed89cff157abdc77d8008f8..d4645b93b89b08ee0eecab7818f0bc94ce652210 100644 (file)
--- a/nominatim/config.py
+++ b/nominatim/config.py
@@ -7,7 +7,7 @@ from pathlib import Path
 
 from dotenv import dotenv_values
 
 
 from dotenv import dotenv_values
 

-from .errors import UsageError
+from nominatim.errors import UsageError

 
 LOG = logging.getLogger()
 
 
 LOG = logging.getLogger()
 


@@ -25,8 +25,8 @@ class Configuration:
         avoid conflicts with other environment variables.
     """
 
         avoid conflicts with other environment variables.
     """
 

-    def __init__(self, project_dir, config_dir, environ=os.environ):
-        self.environ = environ
+    def __init__(self, project_dir, config_dir, environ=None):
+        self.environ = environ or os.environ

         self.project_dir = project_dir
         self.config_dir = config_dir
         self._config = dotenv_values(str((config_dir / 'env.defaults').resolve()))
         self.project_dir = project_dir
         self.config_dir = config_dir
         self._config = dotenv_values(str((config_dir / 'env.defaults').resolve()))