diff options
author | Ned Batchelder <ned@nedbatchelder.com> | 2016-12-30 17:30:59 -0500 |
---|---|---|
committer | Ned Batchelder <ned@nedbatchelder.com> | 2016-12-30 17:30:59 -0500 |
commit | efc0a70a97c50a2005858d6bb7a21d6aeaee4d1e (patch) | |
tree | e2ed4e6f309d7ddaa4957e160046c0e5d2e053e6 /coverage/config.py | |
parent | eba5beb429e389dfe29ce0625328b03e4e1b5de0 (diff) | |
download | python-coveragepy-git-efc0a70a97c50a2005858d6bb7a21d6aeaee4d1e.tar.gz |
Remove hastiliy short-circuited check for conflicting include and source
Diffstat (limited to 'coverage/config.py')
-rw-r--r-- | coverage/config.py | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/coverage/config.py b/coverage/config.py index bec7e7a9..3dd6ea9c 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 |