summaryrefslogtreecommitdiff
path: root/tox
diff options
context:
space:
mode:
authorAlexander Schepanovski <suor.web@gmail.com>2014-08-09 20:55:53 +0800
committerAlexander Schepanovski <suor.web@gmail.com>2014-08-09 20:55:53 +0800
commite81fb051926ea451bf32a3a57b6db22664160235 (patch)
tree733996bc12d2849bf2f09e2ee32f40735900ae18 /tox
parent57db8e1ec819a6d2ed89c542707a7fc0295c56f9 (diff)
downloadtox-git-e81fb051926ea451bf32a3a57b6db22664160235.tar.gz
Remove factor negation support
Diffstat (limited to 'tox')
-rw-r--r--tox/_config.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/tox/_config.py b/tox/_config.py
index 6e8e706d..25039625 100644
--- a/tox/_config.py
+++ b/tox/_config.py
@@ -302,7 +302,7 @@ class parseini:
factors = set()
if section in self._cfg:
for _, value in self._cfg[section].items():
- factors.update(re.findall(r'^!?(\w+)\:\s+', value, re.M))
+ factors.update(re.findall(r'^(\w+)\:\s+', value, re.M))
return factors
def _makeenvconfig(self, name, section, subs, config):
@@ -628,12 +628,12 @@ class IniReader:
def _apply_factors(self, s):
def factor_line(line):
- m = re.search(r'^(!)?(\w+)\:\s+(.+)', line)
+ m = re.search(r'^(\w+)\:\s+(.+)', line)
if not m:
return line
- negate, factor, line = m.groups()
- if bool(negate) ^ (factor in self.factors):
+ factor, line = m.groups()
+ if factor in self.factors:
return line
lines = s.strip().splitlines()