Tweaks to Matt's merged pull request.

AUTHORS.txt

@@ -13,6 +13,7 @@ Pablo Carballo
 Guillaume Chazarain
 David Christian
 Marcus Cobden
+Matthew Desmarais
 Danek Duvall
 Ben Finney
 Martin Fuzzey

coverage/files.py

@@ -127,9 +127,8 @@ def prep_patterns(patterns):
     If `patterns` is None, an empty list is returned.
 
     """
-    patterns = patterns or []
     prepped = []
-    for p in patterns:
+    for p in patterns or []:
         if p.startswith("*") or p.startswith("?"):
             prepped.append(p)
         else:

tests/test_misc.py

@@ -63,6 +63,7 @@ def test_metadata(self):
 
     def test_more_metadata(self):
         # Let's be sure we pick up our own setup.py
+        # CoverageTest.tearDown restores the original sys.path.
         sys.path.insert(0, '')
         from setup import setup_args
 

tests/test_oddball.py

@@ -308,11 +308,10 @@ def doit(calls):
             for f, llist in lines.items():
                 # f is a path to a python module, so we drop the '.py' to get
                 # a callname
-                callname = os.path.basename(f)[:-3]
-                if callname not in callnames:
-                    # ignore this file.
-                    continue
-                clean_lines[os.path.basename(f)] = llist
+                basename = os.path.basename(f)
+                assert basename.endswith(".py")
+                if basename[:-3] in callnames:
+                    clean_lines[basename] = llist
             self.assertEqual(clean_lines, lines_expected)