summaryrefslogtreecommitdiff
path: root/coverage/data.py
diff options
context:
space:
mode:
Diffstat (limited to 'coverage/data.py')
-rw-r--r--coverage/data.py5
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()