From 7397bb2a2f4f2dcbe7804d0abaf5aafcb73cf182 Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Wed, 29 Jul 2015 20:07:55 -0400 Subject: Remove an unneeded import. --- coverage/control.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'coverage/control.py') diff --git a/coverage/control.py b/coverage/control.py index 8a671fe..76960a4 100644 --- a/coverage/control.py +++ b/coverage/control.py @@ -778,8 +778,6 @@ class Coverage(object): self.data.touch_file(py_file) # Add run information. - from coverage import __version__ - self.data.add_run_info( brief_sys=" ".join([ platform.python_implementation(), -- cgit v1.2.1 From 7f0e87b3e2a99968e7e49eb8b7d2231b801b7da9 Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Thu, 30 Jul 2015 07:13:45 -0400 Subject: Refactoring cmdline in prep for getting --append to work again. --- coverage/control.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'coverage/control.py') diff --git a/coverage/control.py b/coverage/control.py index 76960a4..80bd853 100644 --- a/coverage/control.py +++ b/coverage/control.py @@ -721,6 +721,7 @@ class Coverage(object): """ self._init() + aliases = None if self.config.paths: aliases = PathAliases() @@ -728,6 +729,7 @@ class Coverage(object): result = paths[0] for pattern in paths[1:]: aliases.add(pattern, result) + self.data_files.combine_parallel_data(self.data, aliases=aliases, data_dirs=data_dirs) def get_data(self): -- cgit v1.2.1