summaryrefslogtreecommitdiff
path: root/coverage/control.py
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2015-07-30 07:34:37 -0400
committerNed Batchelder <ned@nedbatchelder.com>2015-07-30 07:34:37 -0400
commite812f4dd7e82a9de6323b139c9ae3e02cd16d7f0 (patch)
treebc6cf8876d9e990142c3b16180f1974f279d57d8 /coverage/control.py
parentc78f8f2df1e3d2843514b98b9fedafb454711b0c (diff)
downloadpython-coveragepy-e812f4dd7e82a9de6323b139c9ae3e02cd16d7f0.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.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/coverage/control.py b/coverage/control.py
index 80bd853..deeeae4 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.