fix interpolation order

add interpolation order test
theskumar · Jun 27, 2020 · b29a227 · b29a227
1 parent d83c1b6
commit b29a227
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/dotenv/main.py b/src/dotenv/main.py
@@ -220,7 +220,7 @@ def _replacement(name, default):
         then look into the dotenv variables
         """
         default = default if default is not None else ""
-        ret = os.getenv(name, new_values.get(name, default))
+        ret = new_values.get(name, os.getenv(name, default))
         return ret  # type: ignore
 
     def _re_sub_callback(match):

diff --git a/tests/test_main.py b/tests/test_main.py
@@ -334,6 +334,9 @@ def test_dotenv_values_file(dotenv_file):
 
         # Reused
         ({"b": "c"}, "a=${b}${b}", True, {"a": "cc"}),
+
+        # interpolate with re-defined var
+        ({"b": "b_os_env"}, "b='b_dot_env'\na=a/${b}", True, {"a": "a/b_dot_env", "b": "b_dot_env"})
     ],
 )
 def test_dotenv_values_stream(env, string, interpolate, expected):