X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/f535340d5af0b59c1bbdfde885b62dd483a9e38e..7f11de0db9ecbb2a8f7551815285d7553747a96e:/src/nominatim_db/config.py diff --git a/src/nominatim_db/config.py b/src/nominatim_db/config.py index 5ae3dea3..2cab0237 100644 --- a/src/nominatim_db/config.py +++ b/src/nominatim_db/config.py @@ -59,15 +59,17 @@ class Configuration: other than string. """ - def __init__(self, project_dir: Optional[Path], + def __init__(self, project_dir: Optional[Union[Path, str]], environ: Optional[Mapping[str, str]] = None) -> None: self.environ = environ or os.environ - self.project_dir = project_dir self.config_dir = paths.CONFIG_DIR self._config = dotenv_values(str(self.config_dir / 'env.defaults')) - if self.project_dir is not None and (self.project_dir / '.env').is_file(): - self.project_dir = self.project_dir.resolve() - self._config.update(dotenv_values(str(self.project_dir / '.env'))) + if project_dir is not None: + self.project_dir: Optional[Path] = Path(project_dir).resolve() + if (self.project_dir / '.env').is_file(): + self._config.update(dotenv_values(str(self.project_dir / '.env'))) + else: + self.project_dir = None class _LibDirs: module: Path