Merged in desmaj/coverage.py (pull request #17)

Removed redundant code; Changed a setup.py test to ensure that the proper setup.py is imported; Changed the 'oddball' tests to use a filename whitelist instead of a blacklist (so that tests run better under instrumental)

1 files changed, 6 insertions, 0 deletions

diff --git a/coverage/control.py b/coverage/control.py
index afb6137..09bd75f 100644
--- a/coverage/control.py
+++ b/coverage/control.py
@@ -499,6 +499,12 @@ class coverage(object):
             for src in self.source:
                 for py_file in find_python_files(src):
                     py_file = self.file_locator.canonical_filename(py_file)
+
+                    if self.omit_match and self.omit_match.match(py_file):
+                        # Turns out this file was omitted, so don't pull it
+                        # back in as unexecuted.
+                        continue
+
                     self.data.touch_file(py_file)
 
             self._measured = False