ae-base 0.3.61__py3-none-any.whl → 0.3.64__py3-none-any.whl

ae/base.py

@@ -171,7 +171,7 @@ from types import ModuleType
 from typing import Any, Callable, Generator, Iterable, MutableMapping, Optional, Union, cast
 
 
-__version__ = '0.3.61'
+__version__ = '0.3.64'
 
 
 os_path_abspath = os.path.abspath
@@ -641,7 +641,7 @@ def load_dotenvs():
         load_env_var_defaults(os_path_dirname(os_path_abspath(file_name)), env_vars)
 
 
-def load_env_var_defaults(start_dir: str, env_vars: MutableMapping[str, str]):
+def load_env_var_defaults(start_dir: str, env_vars: MutableMapping[str, str]) -> MutableMapping[str, str]:
     """ load undeclared env var defaults from a chain of ``.env`` files starting in the specified folder or its parent.
 
     :param start_dir:           folder to start search of an ``.env`` file, if not found, then also checks the parent
@@ -653,21 +653,25 @@ def load_env_var_defaults(start_dir: str, env_vars: MutableMapping[str, str]):
     :param env_vars:            environment variables mapping to be amended with env variable values from any
                                 found ``.env`` file. pass Python's :data:`os.environ` to amend this mapping directly
                                 with all the already not declared environment variables.
+    :return:                    dict with the loaded env var names (keys) and values.
     """
     start_dir = norm_path(start_dir)
     file_path = os_path_join(start_dir, DOTENV_FILE_NAME)
     if not os_path_isfile(file_path):
         file_path = os_path_join(os_path_dirname(start_dir), DOTENV_FILE_NAME)
 
+    loaded_vars = {}
     while os_path_isfile(file_path):
         for var_nam, var_val in parse_dotenv(file_path).items():
             if var_nam not in env_vars:
-                env_vars[var_nam] = var_val
+                env_vars[var_nam] = loaded_vars[var_nam] = var_val
 
         if os.sep not in file_path:
             break           # pragma: no cover # prevent endless-loop for ``.env`` file in root dir (os.sep == '/')
         file_path = os_path_join(os_path_dirname(os_path_dirname(file_path)), DOTENV_FILE_NAME)
 
+    return loaded_vars
+
 
 def main_file_paths_parts(portion_name: str) -> tuple[tuple[str, ...], ...]:
     """ determine tuple of supported main/version file name path part tuples.
@@ -1245,30 +1249,25 @@ def write_file(file_path: str, content: Union[str, bytes],
 class ErrorMsgMixin:                                                # pylint: disable=too-few-public-methods
     """ mixin class providing sophisticated error message handling. """
     _err_msg: str = ""
-
-    cae = None
-    po = print
-    dpo = print
-    vpo = print
+    main_app = None
+    po = dpo = vpo = print
 
     def __init__(self):
         try:
             from ae.core import main_app_instance       # type: ignore # pylint: disable=import-outside-toplevel
 
-            self.cae = cae = main_app_instance()
-            assert cae is not None, f"{self.__class__.__name__}.__init__() called too early; main app instance not"
+            self.main_app = main_app = main_app_instance()
+            assert main_app is not None, f"{self.__class__.__name__}.__init__() called too early; main app instance not"
 
-            self.po = cae.po
-            self.dpo = cae.dpo
-            self.vpo = cae.vpo
+            self.po = main_app.po
+            self.dpo = main_app.dpo
+            self.vpo = main_app.vpo
 
         except (ImportError, AssertionError, Exception) as exc:                 # pylint: disable=broad-except
             print(f"{self.__class__.__name__}.__init__() raised {exc}; using print() instead of main app error loggers")
 
-            # self.cae = None
-            # self.po = print
-            # self.dpo = print
-            # self.vpo = print
+            # self.main_app = None
+            # self.po = self.dpo = self.vpo = print
 
     @property
     def error_message(self) -> str:

{ae_base-0.3.61.dist-info → ae_base-0.3.64.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ae_base
-Version: 0.3.61
+Version: 0.3.64
 Summary: ae namespace module portion base: basic constants, helper functions and context manager
 Home-page: https://gitlab.com/ae-group/ae_base
 Author: AndiEcker
@@ -69,13 +69,13 @@ Dynamic: summary
 
 <!-- THIS FILE IS EXCLUSIVELY MAINTAINED by the project ae.ae V0.3.96 -->
 <!-- THIS FILE IS EXCLUSIVELY MAINTAINED by the project aedev.tpl_namespace_root V0.3.14 -->
-# base 0.3.61
+# base 0.3.64
 
 [![GitLab develop](https://img.shields.io/gitlab/pipeline/ae-group/ae_base/develop?logo=python)](
     https://gitlab.com/ae-group/ae_base)
 [![LatestPyPIrelease](
-    https://img.shields.io/gitlab/pipeline/ae-group/ae_base/release0.3.60?logo=python)](
-    https://gitlab.com/ae-group/ae_base/-/tree/release0.3.60)
+    https://img.shields.io/gitlab/pipeline/ae-group/ae_base/release0.3.63?logo=python)](
+    https://gitlab.com/ae-group/ae_base/-/tree/release0.3.63)
 [![PyPIVersions](https://img.shields.io/pypi/v/ae_base)](
     https://pypi.org/project/ae-base/#history)
 

ae_base-0.3.64.dist-info/RECORD

@@ -0,0 +1,7 @@
+ae/base.py,sha256=STUdNRroIq5IXtXCqWRg8vIu-Vx-qvOT8f7gnv8uhH8,67812
+ae_base-0.3.64.dist-info/licenses/LICENSE.md,sha256=vn9XT8MDUxNAWsP60HLwHJp8ZLOI0OJBRe-1N2xXh08,35002
+ae_base-0.3.64.dist-info/METADATA,sha256=Yo8TxzMWNjmhRMgJwKFsXW3Ui6M9IA358AIO1abx4mE,5724
+ae_base-0.3.64.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ae_base-0.3.64.dist-info/top_level.txt,sha256=vUdgAslSmhZLXWU48fm8AG2BjVnkOWLco8rzuW-5zY0,3
+ae_base-0.3.64.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+ae_base-0.3.64.dist-info/RECORD,,

ae_base-0.3.61.dist-info/RECORD

@@ -1,7 +0,0 @@
-ae/base.py,sha256=RlIALdehqSfXnfsAQO08ZQditIvM7lhhoq6nxI207W0,67651
-ae_base-0.3.61.dist-info/licenses/LICENSE.md,sha256=vn9XT8MDUxNAWsP60HLwHJp8ZLOI0OJBRe-1N2xXh08,35002
-ae_base-0.3.61.dist-info/METADATA,sha256=yrc326HYYiuFYCWc13w5RIabiR_fJnLCW1VtnyEGblU,5724
-ae_base-0.3.61.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ae_base-0.3.61.dist-info/top_level.txt,sha256=vUdgAslSmhZLXWU48fm8AG2BjVnkOWLco8rzuW-5zY0,3
-ae_base-0.3.61.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-ae_base-0.3.61.dist-info/RECORD,,