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 | 7d2bbbbf59b0c1fa47854f44d055b50f9a8277b5 (patch) | |
| tree | 2c1d106bd3a419eb1812895ad648dc1eb82c18d2 /coverage/data.py | |
| parent | 00da78dcc7b666a11d64915819e4ae7a89d00704 (diff) | |
| download | python-coveragepy-7d2bbbbf59b0c1fa47854f44d055b50f9a8277b5.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 f50bf1c..981edf8 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() |