for backward compatibility added option not to force all to jinja templating

mwaaas · mwaaas · commit f4b2072fec9e · 2018-02-23T13:52:06.000+03:00
diff --git a/dotenv/main.py b/dotenv/main.py
@@ -25,7 +25,7 @@ def jinja_templating(variable):
     return variable
 
 
-def load_dotenv(dotenv_path, verbose=False, override=False):
+def load_dotenv(dotenv_path, verbose=False, override=False, jinja_template=False):
     """
     Read a .env file and load into os.environ.
     """
@@ -34,7 +34,8 @@ def load_dotenv(dotenv_path, verbose=False, override=False):
             warnings.warn("Not loading %s - it doesn't exist." % dotenv_path)
         return None
     for k, v in dotenv_values(dotenv_path).items():
-        v = jinja_templating(v)
+        if jinja_template:
+            v = jinja_templating(v)
         if override:
             os.environ[k] = v
         else:
diff --git a/tests/test_core.py b/tests/test_core.py
@@ -95,7 +95,7 @@ def test_load_dotenv_variable_jinja_formatting(cli):
         set_key(dotenv_path, 'a', 'foo')
         set_key(dotenv_path, 'b', '{{a}}/bar')
         set_key(dotenv_path, 'c', '{bar}')
-        success = load_dotenv(dotenv_path)
+        success = load_dotenv(dotenv_path, jinja_template=True)
         assert success
         assert os.environ['a'] == 'foo'
         assert os.environ['b'] == 'foo/bar'
@@ -109,7 +109,7 @@ def test_load_dotenv_variable_filtering(cli):
         sh.touch(dotenv_path)
         set_key(dotenv_path, 'd', 'foo')
         set_key(dotenv_path, 'e', '{{a|upper}}')
-        success = load_dotenv(dotenv_path)
+        success = load_dotenv(dotenv_path, jinja_template=True)
         assert success
         assert os.environ['d'] == 'foo'
         assert os.environ['e'] == os.environ['a'].upper()
