summaryrefslogtreecommitdiff
path: root/coverage
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2016-10-21 15:16:04 -0400
committerNed Batchelder <ned@nedbatchelder.com>2016-10-21 15:16:04 -0400
commitcb77fe4a51589614d4870cdf2d5bd7ee2524f4d5 (patch)
tree9b3312425bf3df099c902e51ffc594f3197ed0b9 /coverage
parent15f879b94b06d268f74c195a5614c7ca429363ce (diff)
downloadpython-coveragepy-git-cb77fe4a51589614d4870cdf2d5bd7ee2524f4d5.tar.gz
Test the debug settings more, and strip spaces from the environment variable
Diffstat (limited to 'coverage')
-rw-r--r--coverage/control.py2
-rw-r--r--coverage/data.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/coverage/control.py b/coverage/control.py
index f7be083d..8bca939c 100644
--- a/coverage/control.py
+++ b/coverage/control.py
@@ -162,7 +162,7 @@ class Coverage(object):
self.config.data_file = env_data_file
debugs = os.environ.get('COVERAGE_DEBUG')
if debugs:
- self.config.debug.extend(debugs.split(","))
+ self.config.debug.extend(d.strip() for d in debugs.split(","))
# 4: from constructor arguments:
self.config.from_args(
diff --git a/coverage/data.py b/coverage/data.py
index bd114627..50b309af 100644
--- a/coverage/data.py
+++ b/coverage/data.py
@@ -719,7 +719,7 @@ class CoverageDataFiles(object):
raise CoverageException("No data to combine")
for f in files_to_combine:
- new_data = CoverageData()
+ new_data = CoverageData(debug=self.debug)
try:
new_data.read_file(f)
except CoverageException as exc: