diff options
Diffstat (limited to 'coverage')
| -rw-r--r-- | coverage/cmdline.py | 16 | ||||
| -rw-r--r-- | coverage/codeunit.py | 5 | ||||
| -rw-r--r-- | coverage/control.py | 6 |
3 files changed, 16 insertions, 11 deletions
diff --git a/coverage/cmdline.py b/coverage/cmdline.py index 700b1e18..9148904e 100644 --- a/coverage/cmdline.py +++ b/coverage/cmdline.py @@ -439,6 +439,14 @@ class CoverageScript(object): self.help_fn("Nothing to do.") return ERR + # Listify the list options. + omit = None + if options.omit: + omit = options.omit.split(',') + include = None + if options.include: + include = options.include.split(',') + # Do something. self.coverage = self.covpkg.coverage( data_suffix = options.parallel_mode, @@ -446,6 +454,8 @@ class CoverageScript(object): timid = options.timid, branch = options.branch, config_file = options.rcfile, + omit_prefixes = omit, + include_prefixes = include, ) if 'debug' in options.actions: @@ -504,13 +514,7 @@ class CoverageScript(object): 'ignore_errors': options.ignore_errors, } - omit = None - if options.omit: - omit = options.omit.split(',') report_args['omit_prefixes'] = omit - include = None - if options.include: - include = options.include.split(',') report_args['include_prefixes'] = include if 'report' in options.actions: diff --git a/coverage/codeunit.py b/coverage/codeunit.py index 5df49804..6312efe2 100644 --- a/coverage/codeunit.py +++ b/coverage/codeunit.py @@ -45,9 +45,9 @@ def code_unit_factory(morfs, file_locator, omit_prefixes=None, include_prefixes= if cu.filename.startswith(prefix): filtered.append(cu) break - code_units = filtered - elif omit_prefixes: + + if omit_prefixes: assert not isinstance(omit_prefixes, string_class) # common mistake prefixes = [file_locator.abs_file(p) for p in omit_prefixes] filtered = [] @@ -57,7 +57,6 @@ def code_unit_factory(morfs, file_locator, omit_prefixes=None, include_prefixes= break else: filtered.append(cu) - code_units = filtered return code_units diff --git a/coverage/control.py b/coverage/control.py index 9ac7fea9..1ed3df54 100644 --- a/coverage/control.py +++ b/coverage/control.py @@ -31,7 +31,8 @@ class coverage(object): """ def __init__(self, data_file=None, data_suffix=None, cover_pylib=None, - auto_data=False, timid=None, branch=None, config_file=True, omit_prefixes=None, include_prefixes=None): + auto_data=False, timid=None, branch=None, config_file=True, + omit_prefixes=None, include_prefixes=None): """ `data_file` is the base name of the data file to use, defaulting to ".coverage". `data_suffix` is appended (with a dot) to `data_file` to @@ -190,10 +191,11 @@ class coverage(object): if canonical.startswith(self.cover_prefix): return False + # Check the file against the include and omit prefixes. if self.include_prefixes: for prefix in self.include_prefixes: if canonical.startswith(prefix): - return canonical + break else: return False for prefix in self.omit_prefixes: |