From e7c532c2dbcef6281df5a7a0db53eca4083a026a Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Tue, 22 Sep 2015 12:56:00 -0400 Subject: Use more compact code for includes and omits --- coverage/report.py | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) (limited to 'coverage/report.py') 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. -- cgit v1.2.1