summaryrefslogtreecommitdiff
path: root/tox/config.py
diff options
context:
space:
mode:
authorAndrei Pashkin <andrew.pashkin@gmx.co.uk>2016-09-09 14:45:54 +0300
committerAndrei Pashkin <andrew.pashkin@gmx.co.uk>2016-09-09 14:45:54 +0300
commit4d51de7c16dddee793da14e319ad86c686ff5be1 (patch)
tree0bddb4ea8e912ab6ed1febc9d69c7e32ddf9490c /tox/config.py
parent214ed8a7cde5f68882a566df86ce3878fa66ec77 (diff)
downloadtox-issue302.tar.gz
Make substitution engine ignore factor arrays, fix #302issue302
The fix assumes, that the bug was that the substitution engine - tox.config.Replacer, while recursvely replacing references to actual values, treated factor arrays (like {py27,py34}) as references, that are needed to be replaced, which they are not. The patch simply amends regex which is used by Replacer to recognize references, to ignore factor arrays. And factor arrays assumed to be values, enclosed in curly braces, that contain at least one comma.
Diffstat (limited to 'tox/config.py')
-rw-r--r--tox/config.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tox/config.py b/tox/config.py
index ad453f6..d6b4c52 100644
--- a/tox/config.py
+++ b/tox/config.py
@@ -1017,7 +1017,7 @@ class Replacer:
r'''
(?<!\\)[{]
(?:(?P<sub_type>[^[:{}]+):)? # optional sub_type for special rules
- (?P<substitution_value>[^{}]*) # substitution key
+ (?P<substitution_value>[^,{}]*) # substitution key
[}]
''', re.VERBOSE)