diff options
| author | Ned Batchelder <ned@nedbatchelder.com> | 2015-07-30 07:15:12 -0400 |
|---|---|---|
| committer | Ned Batchelder <ned@nedbatchelder.com> | 2015-07-30 07:15:12 -0400 |
| commit | f57c1cf959440b2344bc37f0e8e645563f88d524 (patch) | |
| tree | bbfa6ac56e8d044c1f47276c6fb622804161a419 /coverage/control.py | |
| parent | 31f58b1165dd67d443b1e5fd0403574774a23bfc (diff) | |
| parent | 4c89d686e4db822d17be56d338a89a83f64de59b (diff) | |
| download | python-coveragepy-git-f57c1cf959440b2344bc37f0e8e645563f88d524.tar.gz | |
Automated merge with ssh://bitbucket.org/ned/coveragepy
Diffstat (limited to 'coverage/control.py')
| -rw-r--r-- | coverage/control.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/coverage/control.py b/coverage/control.py index 8a671fe0..80bd853f 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): @@ -778,8 +780,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(), |