diff options
| author | Ned Batchelder <ned@nedbatchelder.com> | 2015-07-30 07:34:37 -0400 |
|---|---|---|
| committer | Ned Batchelder <ned@nedbatchelder.com> | 2015-07-30 07:34:37 -0400 |
| commit | 8bdff4ef8448078d06e4d7aba2d2892b8b9b7ac7 (patch) | |
| tree | de499650c8724205dd8feacb5cac78836fae4884 /coverage/control.py | |
| parent | f57c1cf959440b2344bc37f0e8e645563f88d524 (diff) | |
| download | python-coveragepy-git-8bdff4ef8448078d06e4d7aba2d2892b8b9b7ac7.tar.gz | |
Clean up from the merge of PR 62
Remove the globbing option. Added a test. Corrected parameter names and docs.
Updated the AUTHORS file.
Diffstat (limited to 'coverage/control.py')
| -rw-r--r-- | coverage/control.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/coverage/control.py b/coverage/control.py index 80bd853f..deeeae45 100644 --- a/coverage/control.py +++ b/coverage/control.py @@ -730,7 +730,7 @@ class Coverage(object): for pattern in paths[1:]: aliases.add(pattern, result) - self.data_files.combine_parallel_data(self.data, aliases=aliases, data_dirs=data_dirs) + self.data_files.combine_parallel_data(self.data, aliases=aliases, data_paths=data_dirs) def get_data(self): """Get the collected data and reset the collector. |