From 8293aaedc5b6f7c51f8993aa0d45b5c94dd4a704 Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Sun, 19 Jul 2015 15:46:06 -0400 Subject: More testing of CoverageData.update --- coverage/data.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'coverage') 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() -- cgit v1.2.1