summaryrefslogtreecommitdiff
path: root/coverage
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2016-12-30 17:30:59 -0500
committerNed Batchelder <ned@nedbatchelder.com>2016-12-30 17:30:59 -0500
commit10a4bcbe4854bf274f0be79cabf570c1c2fc55e8 (patch)
treef368a722d0be0b294cb91801923f769177cb642d /coverage
parent349866a3d5866e1b3d0c31bc499917eaf68e22cb (diff)
downloadpython-coveragepy-10a4bcbe4854bf274f0be79cabf570c1c2fc55e8.tar.gz
Remove hastiliy short-circuited check for conflicting include and source
Diffstat (limited to 'coverage')
-rw-r--r--coverage/config.py10
1 files changed, 0 insertions, 10 deletions
diff --git a/coverage/config.py b/coverage/config.py
index bec7e7a..3dd6ea9 100644
--- a/coverage/config.py
+++ b/coverage/config.py
@@ -382,14 +382,6 @@ class CoverageConfig(object):
# If we get here, we didn't find the option.
raise CoverageException("No such option: %r" % option_name)
- def sanity_check(self):
- """Check interactions among settings, and raise if there's a problem."""
- return
- # TODO: This check was too simple, and broke a few things:
- # https://bitbucket.org/ned/coveragepy/issues/541/coverage-43-breaks-nosetest-with-coverage
- if (self.source is not None) and (self.include is not None):
- raise CoverageException("--include and --source are mutually exclusive")
-
def read_coverage_config(config_file, **kwargs):
"""Read the coverage.py configuration.
@@ -446,6 +438,4 @@ def read_coverage_config(config_file, **kwargs):
# 4) from constructor arguments:
config.from_args(**kwargs)
- config.sanity_check()
-
return config_file, config