summaryrefslogtreecommitdiff
path: root/coverage/report.py
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2015-09-22 12:56:00 -0400
committerNed Batchelder <ned@nedbatchelder.com>2015-09-22 12:56:00 -0400
commite7c532c2dbcef6281df5a7a0db53eca4083a026a (patch)
tree3e036f06da3a473f40523d6fe26118c58386345b /coverage/report.py
parent40e4131abdccbfed71a48fe430efaee0264918aa (diff)
downloadpython-coveragepy-git-e7c532c2dbcef6281df5a7a0db53eca4083a026a.tar.gz
Use more compact code for includes and omits
Diffstat (limited to 'coverage/report.py')
-rw-r--r--coverage/report.py24
1 files changed, 7 insertions, 17 deletions
diff --git a/coverage/report.py b/coverage/report.py
index f153aa5a..78ad7484 100644
--- a/coverage/report.py
+++ b/coverage/report.py
@@ -35,27 +35,17 @@ class Reporter(object):
`morfs` is a list of modules or file names.
"""
- self.file_reporters = self.coverage._get_file_reporters(morfs)
+ reporters = self.coverage._get_file_reporters(morfs)
if self.config.include:
- patterns = prep_patterns(self.config.include)
- matcher = FnmatchMatcher(patterns)
- filtered = []
- for fr in self.file_reporters:
- if matcher.match(fr.filename):
- filtered.append(fr)
- self.file_reporters = filtered
+ matcher = FnmatchMatcher(prep_patterns(self.config.include))
+ reporters = [fr for fr in reporters if matcher.match(fr.filename)]
if self.config.omit:
- patterns = prep_patterns(self.config.omit)
- matcher = FnmatchMatcher(patterns)
- filtered = []
- for fr in self.file_reporters:
- if not matcher.match(fr.filename):
- filtered.append(fr)
- self.file_reporters = filtered
-
- self.file_reporters.sort()
+ matcher = FnmatchMatcher(prep_patterns(self.config.omit))
+ reporters = [fr for fr in reporters if not matcher.match(fr.filename)]
+
+ self.file_reporters = sorted(reporters)
def report_files(self, report_fn, morfs, directory=None):
"""Run a reporting function on a number of morfs.