Merge pull request #597 from cboylan/fix-env-sub

Don't attempt to parse dicts if not replacing

Author: obestwalter

tests/test_config.py

@@ -345,15 +345,16 @@ def test_command_env_substitution_global(self, newconfig):
         assert envconfig.commands == [["echo", "bar"]]
 
     def test_reproduce_issue595(self, newconfig):
-        with pytest.raises(ValueError):
-            newconfig("""
-                [tox]
-                envlist = spam
-                [testenv]
-                setenv = DONTCARE = 0
-                [testenv:eggs]
-                setenv = {[testenv]setenv}
-            """)
+        config = newconfig("""
+            [tox]
+            envlist = spam
+            [testenv]
+            setenv = DONTCARE = 0
+            [testenv:eggs]
+            setenv = {[testenv]setenv}
+            sitepackages = {[testenv]sitepackages}
+        """)
+        assert config.envlist == ['spam']
 
 
 class TestIniParser:

tox/config.py

@@ -957,16 +957,17 @@ def getlist(self, name, sep="\n"):
 
     def getdict(self, name, default=None, sep="\n", replace=True):
         value = self.getstring(name, None, replace=replace)
-        return self._getdict(value, default=default, sep=sep)
+        return self._getdict(value, default=default, sep=sep, replace=replace)
 
     def getdict_setenv(self, name, default=None, sep="\n", replace=True):
         value = self.getstring(name, None, replace=replace, crossonly=True)
-        definitions = self._getdict(value, default=default, sep=sep)
+        definitions = self._getdict(value, default=default, sep=sep,
+                                    replace=replace)
         self._setenv = SetenvDict(definitions, reader=self)
         return self._setenv
 
-    def _getdict(self, value, default, sep):
-        if value is None:
+    def _getdict(self, value, default, sep, replace=True):
+        if value is None or not replace:
             return default or {}
 
         d = {}
@@ -979,7 +980,7 @@ def _getdict(self, value, default, sep):
 
     def getbool(self, name, default=None, replace=True):
         s = self.getstring(name, default, replace=replace)
-        if not s:
+        if not s or not replace:
             s = default
         if s is None:
             raise KeyError("no config value [%s] %s found" % (