Allow escaping of {} in defaults (tox-dev#1696)

Fixes tox-dev#1502
ssbarnea · Oct 18, 2020 · f0d8ae2 · f0d8ae2
1 parent 6a59be5
commit f0d8ae2
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 1 deletion.
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -48,6 +48,7 @@ Jake Windle
 Jannis Leidel
 Joachim Brandon LeBlanc
 Johannes Christ
+John Mark Vandenberg
 Jon Dufresne
 Josh Smeaton
 Josh Snyder

diff --git a/docs/changelog/1502.feature.rst b/docs/changelog/1502.feature.rst
@@ -0,0 +1 @@
+Allow \{ and \} in default of {env:key:default}. - by :user:`jayvdb`
diff --git a/src/tox/config/__init__.py b/src/tox/config/__init__.py
@@ -1731,7 +1731,7 @@ class Replacer:
         (?<!\\)[{]
         (?:(?P<sub_type>[^[:{}]+):)?    # optional sub_type for special rules
         (?P<substitution_value>(?:\[[^,{}]*\])?[^:,{}]*)  # substitution key
-        (?::(?P<default_value>[^{}]*))?   # default value
+        (?::(?P<default_value>([^{}]|\\{|\\})*))?   # default value
         [}]
         """,
         re.VERBOSE,

diff --git a/tests/unit/config/test_config.py b/tests/unit/config/test_config.py
@@ -453,6 +453,17 @@ def test_command_env_substitution_global(self, newconfig):
         envconfig = config.envconfigs["python"]
         assert envconfig.commands == [["echo", "bar"]]
 
+    def test_command_env_substitution_default_escape(self, newconfig):
+        """Ensure literal { and } in default of {env:key:default} values."""
+        config = newconfig(
+            r"""
+            [testenv]
+            commands = echo {env:FOO:\{bar\}}
+        """,
+        )
+        envconfig = config.envconfigs["python"]
+        assert envconfig.commands == [["echo", "{bar}"]]
+
     def test_regression_issue595(self, newconfig):
         config = newconfig(
             """
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Allow \{ and \} in default of {env:key:default}. - by :user:`jayvdb`