Merged ned/coveragepy into default

1 files changed, 9 insertions, 11 deletions

diff --git a/coverage/report.py b/coverage/report.py
index 34f44422..7627d1aa 100644
--- a/coverage/report.py
+++ b/coverage/report.py
@@ -1,8 +1,8 @@
 """Reporter foundation for Coverage."""
 
-import fnmatch, os
+import os
 from coverage.codeunit import code_unit_factory
-from coverage.files import prep_patterns
+from coverage.files import prep_patterns, FnmatchMatcher
 from coverage.misc import CoverageException, NoSource, NotPython
 
 class Reporter(object):
@@ -33,26 +33,24 @@ class Reporter(object):
         """
         morfs = morfs or self.coverage.data.measured_files()
         file_locator = self.coverage.file_locator
-        self.code_units = code_unit_factory(morfs, file_locator)
+        get_ext = self.coverage.data.extension_data().get
+        self.code_units = code_unit_factory(morfs, file_locator, get_ext)
 
         if self.config.include:
             patterns = prep_patterns(self.config.include)
+            matcher = FnmatchMatcher(patterns)
             filtered = []
             for cu in self.code_units:
-                for pattern in patterns:
-                    if fnmatch.fnmatch(cu.filename, pattern):
-                        filtered.append(cu)
-                        break
+                if matcher.match(cu.filename):
+                    filtered.append(cu)
             self.code_units = filtered
 
         if self.config.omit:
             patterns = prep_patterns(self.config.omit)
+            matcher = FnmatchMatcher(patterns)
             filtered = []
             for cu in self.code_units:
-                for pattern in patterns:
-                    if fnmatch.fnmatch(cu.filename, pattern):
-                        break
-                else:
+                if not matcher.match(cu.filename):
                     filtered.append(cu)
             self.code_units = filtered