fix interpolation order

elbehery95 · bbc2 · commit 6712bc8a12db · 2020-07-03T10:56:43.000+02:00
add interpolation order test
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,7 +7,10 @@ project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
-*No unreleased change at this time.*
+### Fixed
+
+- Privilege definition in file over the environment in variable expansion (#256 by
+  [@elbehery95]).
 
 ## [0.13.0] - 2020-04-16
 
@@ -197,6 +200,7 @@ project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 [@ulyssessouza]: https://github.com/ulyssessouza
 [@venthur]: https://github.com/venthur
 [@yannham]: https://github.com/yannham
+[@elbehery95]: https://github.com/elbehery95
 
 [Unreleased]: https://github.com/theskumar/python-dotenv/compare/v0.13.0...HEAD
 [0.13.0]: https://github.com/theskumar/python-dotenv/compare/v0.12.0...v0.13.0
diff --git a/src/dotenv/main.py b/src/dotenv/main.py
@@ -214,13 +214,8 @@ def resolve_nested_variables(values):
     # type: (Dict[Text, Optional[Text]]) -> Dict[Text, Optional[Text]]
     def _replacement(name, default):
         # type: (Text, Optional[Text]) -> Text
-        """
-        get appropriate value for a variable name.
-        first search in environ, if not found,
-        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"}),
+
+        # Re-defined and used in file
+        ({"b": "c"}, "b=d\na=${b}", True, {"a": "d", "b": "d"}),
     ],
 )
 def test_dotenv_values_stream(env, string, interpolate, expected):

Original file line number	Diff line number	Diff line change
`@@ -334,6 +334,9 @@ def test_dotenv_values_file(dotenv_file):`
`334`	`334`
`335`	`335`	`# Reused`
`336`	`336`	`({"b": "c"}, "a=${b}${b}", True, {"a": "cc"}),`
	`337`	`+`
	`338`	`+ # Re-defined and used in file`
	`339`	`+ ({"b": "c"}, "b=d\na=${b}", True, {"a": "d", "b": "d"}),`
`337`	`340`	`],`
`338`	`341`	`)`
`339`	`342`	`def test_dotenv_values_stream(env, string, interpolate, expected):`