summaryrefslogtreecommitdiff
path: root/coverage/control.py
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2018-08-04 07:36:13 -0400
committerNed Batchelder <ned@nedbatchelder.com>2018-08-04 07:59:50 -0400
commit2f0d57856550ef7ad248e4e6127700bdabb91e7d (patch)
treeb464de6cd75fd80b3825d2606ef397eced11e51f /coverage/control.py
parent0c5af4612210fa08113ea93372f877ef13aaa007 (diff)
downloadpython-coveragepy-git-2f0d57856550ef7ad248e4e6127700bdabb91e7d.tar.gz
Pull combine_parallel_data out of CoverageData
Diffstat (limited to 'coverage/control.py')
-rw-r--r--coverage/control.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/coverage/control.py b/coverage/control.py
index 1760ee78..2f084cc2 100644
--- a/coverage/control.py
+++ b/coverage/control.py
@@ -15,7 +15,7 @@ from coverage.annotate import AnnotateReporter
from coverage.backward import string_class, iitems
from coverage.collector import Collector
from coverage.config import read_coverage_config
-from coverage.data import CoverageData
+from coverage.data import CoverageData, combine_parallel_data
from coverage.debug import DebugControl, write_formatted_info
from coverage.disposition import disposition_debug_msg
from coverage.files import PathAliases, set_relative_directory, abs_file
@@ -536,7 +536,7 @@ class Coverage(object):
for pattern in paths[1:]:
aliases.add(pattern, result)
- self._data.combine_parallel_data(aliases=aliases, data_paths=data_paths, strict=strict)
+ combine_parallel_data(self._data, aliases=aliases, data_paths=data_paths, strict=strict)
def get_data(self):
"""Get the collected data.