From 0584dd837ce55a54e10b9e92fc8e8b9066bff6eb Mon Sep 17 00:00:00 2001
From: Krzysztof Magusiak <chris.magusiak@gmail.com>
Date: Tue, 5 Jul 2022 12:39:20 +0200
Subject: [PATCH] Load variables from envrion with exception handling

---
 alphaconf/__init__.py | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/alphaconf/__init__.py b/alphaconf/__init__.py
index a7196ae..ca09ff7 100644
--- a/alphaconf/__init__.py
+++ b/alphaconf/__init__.py
@@ -167,6 +167,25 @@ def _load_dotenv(self, load_dotenv: Optional[bool] = None):
                 raise
             _log.debug('dotenv is not installed')
 
+    def __load_environ(self, prefixes: Iterable[str]) -> DictConfig:
+        """Load environment variables into a dict configuration"""
+        from yaml.error import YAMLError  # type: ignore
+
+        trans = str.maketrans('_', '.', '"\\=')
+        dotlist = [
+            (name.lower().translate(trans), value)
+            for name, value in os.environ.items()
+            if name.startswith(tuple(prefixes))
+        ]
+        conf = OmegaConf.create({})
+        for name, value in dotlist:
+            try:
+                conf.merge_with_dotlist(["%s=%s" % (name, value)])
+            except YAMLError:
+                # if cannot load the value as a dotlist, just add the string
+                OmegaConf.update(conf, name, value)
+        return conf
+
     def _get_configurations(
         self,
         env_prefixes: Union[bool, Iterable[str]] = True,
@@ -210,12 +229,7 @@ def _get_configurations(
             prefixes = None
         if prefixes:
             _log.debug('Loading env configuration from prefixes %s' % (prefixes,))
-            dotlist = [
-                "%s=\"%s\"" % (name.lower().replace('_', '.').replace('"', '\\"'), value)
-                for name, value in os.environ.items()
-                if name.startswith(prefixes)
-            ]
-            yield OmegaConf.from_dotlist(dotlist)
+            yield self.__load_environ(prefixes)
 
     def setup_configuration(
         self,