diff options
| author | Ned Batchelder <ned@nedbatchelder.com> | 2015-07-19 15:46:06 -0400 |
|---|---|---|
| committer | Ned Batchelder <ned@nedbatchelder.com> | 2015-07-19 15:46:06 -0400 |
| commit | 8293aaedc5b6f7c51f8993aa0d45b5c94dd4a704 (patch) | |
| tree | 599c3c3c248269de477779890ec58aebee35ebfe /coverage/data.py | |
| parent | 3cf3f1a78231e8da18153e7aa5ff9dd1f814e7bb (diff) | |
| download | python-coveragepy-git-8293aaedc5b6f7c51f8993aa0d45b5c94dd4a704.tar.gz | |
More testing of CoverageData.update
Diffstat (limited to 'coverage/data.py')
| -rw-r--r-- | coverage/data.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/coverage/data.py b/coverage/data.py index f50bf1cf..981edf8d 100644 --- a/coverage/data.py +++ b/coverage/data.py @@ -206,8 +206,9 @@ class CoverageData(object): re-map paths to match the local machine's. """ - if ((self.has_lines() and other_data.has_arcs()) or - (self.has_arcs() and other_data.has_lines())): + if self.has_lines() and other_data.has_arcs(): + raise CoverageException("Can't combine arc data with line data") + if self.has_arcs() and other_data.has_lines(): raise CoverageException("Can't combine line data with arc data") aliases = aliases or PathAliases() |