Give this helper function a better name, it's confused me too many times.

3 files changed, 25 insertions, 20 deletions

diff --git a/test/coveragetest.py b/test/coveragetest.py
index f09afc1..4dd8755 100644
--- a/test/coveragetest.py
+++ b/test/coveragetest.py
@@ -146,8 +146,13 @@ class CoverageTest(TestCase):
 
         return filename
 
-    def import_module(self, modname):
-        """Import the module named modname, and return the module object."""
+    def import_local_file(self, modname):
+        """Import a local file as a module.
+        
+        Opens a file in the current directory named `modname`.py, imports it
+        as `modname`, and returns the module object.
+        
+        """
         modfile = modname + '.py'
         f = open(modfile, 'r')
 
@@ -255,7 +260,7 @@ class CoverageTest(TestCase):
 
         try:                                    # pragma: recursive coverage
             # Import the python file, executing it.
-            mod = self.import_module(modname)
+            mod = self.import_local_file(modname)
         finally:                                # pragma: recursive coverage
             # Stop Coverage.
             cov.stop()
diff --git a/test/test_api.py b/test/test_api.py
index 264d713..9a29103 100644
--- a/test/test_api.py
+++ b/test/test_api.py
@@ -34,7 +34,7 @@ class SingletonApiTest(CoverageTest):
 
         # Import the python file, executing it.
         coverage.start()
-        self.import_module(modname)             # pragma: recursive coverage
+        self.import_local_file(modname)         # pragma: recursive coverage
         coverage.stop()                         # pragma: recursive coverage
 
     def test_simple(self):
@@ -50,7 +50,7 @@ class SingletonApiTest(CoverageTest):
 
         # Import the python file, executing it.
         coverage.start()
-        self.import_module("mycode")            # pragma: recursive coverage
+        self.import_local_file("mycode")        # pragma: recursive coverage
         coverage.stop()                         # pragma: recursive coverage
 
         _, statements, missing, missingtext = coverage.analysis("mycode.py")
@@ -107,7 +107,7 @@ class ApiTest(CoverageTest):
 
         # Import the python file, executing it.
         cov.start()
-        self.import_module("mycode")            # pragma: recursive coverage
+        self.import_local_file("mycode")        # pragma: recursive coverage
         cov.stop()                              # pragma: recursive coverage
 
         _, statements, missing, _ = cov.analysis("not_run.py")
@@ -128,7 +128,7 @@ class ApiTest(CoverageTest):
         # Import the python file, executing it.
         cov = coverage.coverage()
         cov.start()
-        self.import_module("mymain")            # pragma: recursive coverage
+        self.import_local_file("mymain")        # pragma: recursive coverage
         cov.stop()                              # pragma: recursive coverage
 
         filename, _, _, _ = cov.analysis("mymain.py")
@@ -145,7 +145,7 @@ class ApiTest(CoverageTest):
         # already.
         cov = coverage.coverage()
         cov.start()
-        self.import_module("mymain")            # pragma: recursive coverage
+        self.import_local_file("mymain")        # pragma: recursive coverage
         cov.stop()                              # pragma: recursive coverage
 
         filename, _, _, _ = cov.analysis("mymain.py")
@@ -173,7 +173,7 @@ class ApiTest(CoverageTest):
         cov1 = coverage.coverage()
         self.assertEqual(cov1.config.cover_pylib, False)
         cov1.start()
-        self.import_module("mymain")            # pragma: recursive coverage
+        self.import_local_file("mymain")        # pragma: recursive coverage
         cov1.stop()                             # pragma: recursive coverage
 
         # some statements were marked executed in mymain.py
@@ -186,7 +186,7 @@ class ApiTest(CoverageTest):
         # Measure with the stdlib.
         cov2 = coverage.coverage(cover_pylib=True)
         cov2.start()
-        self.import_module("mymain")            # pragma: recursive coverage
+        self.import_local_file("mymain")        # pragma: recursive coverage
         cov2.stop()                             # pragma: recursive coverage
 
         # some statements were marked executed in mymain.py
@@ -217,7 +217,7 @@ class ApiTest(CoverageTest):
         self.assertSameElements(os.listdir("."), ["datatest1.py"])
         cov = coverage.coverage()
         cov.start()
-        self.import_module("datatest1")         # pragma: recursive coverage
+        self.import_local_file("datatest1")     # pragma: recursive coverage
         cov.stop()                              # pragma: recursive coverage
         cov.save()
         self.assertSameElements(os.listdir("."),
@@ -232,7 +232,7 @@ class ApiTest(CoverageTest):
         self.assertSameElements(os.listdir("."), ["datatest2.py"])
         cov = coverage.coverage(data_file="cov.data")
         cov.start()
-        self.import_module("datatest2")         # pragma: recursive coverage
+        self.import_local_file("datatest2")     # pragma: recursive coverage
         cov.stop()                              # pragma: recursive coverage
         cov.save()
         self.assertSameElements(os.listdir("."),
@@ -247,7 +247,7 @@ class ApiTest(CoverageTest):
         self.assertSameElements(os.listdir("."), ["datatest3.py"])
         cov = coverage.coverage(data_file="cov.data", data_suffix="14")
         cov.start()
-        self.import_module("datatest3")         # pragma: recursive coverage
+        self.import_local_file("datatest3")     # pragma: recursive coverage
         cov.stop()                              # pragma: recursive coverage
         cov.save()
         self.assertSameElements(os.listdir("."),
@@ -267,7 +267,7 @@ class ApiTest(CoverageTest):
                                             ["datatest4.py", ".coveragerc"])
         cov = coverage.coverage()
         cov.start()
-        self.import_module("datatest4")         # pragma: recursive coverage
+        self.import_local_file("datatest4")     # pragma: recursive coverage
         cov.stop()                              # pragma: recursive coverage
         cov.save()
         self.assertSameElements(os.listdir("."),
@@ -294,7 +294,7 @@ class OmitIncludeTest(CoverageTest):
 
         cov = coverage.coverage()
         cov.start()
-        self.import_module("b")
+        self.import_local_file("b")
         cov.stop()
         lines = cov.data.summary()
         self.assertEqual(lines['a.py'], 1)
@@ -311,7 +311,7 @@ class OmitIncludeTest(CoverageTest):
 
         cov = coverage.coverage(include=["a.py"])
         cov.start()
-        self.import_module("b")
+        self.import_local_file("b")
         cov.stop()
         lines = cov.data.summary()
         self.assertEqual(lines['a.py'], 1)
@@ -328,7 +328,7 @@ class OmitIncludeTest(CoverageTest):
 
         cov = coverage.coverage(omit=["a*"])
         cov.start()
-        self.import_module("b")
+        self.import_local_file("b")
         cov.stop()
         lines = cov.data.summary()
         self.assert_('a.py' not in lines)
@@ -345,7 +345,7 @@ class OmitIncludeTest(CoverageTest):
 
         cov = coverage.coverage(include=["a*"], omit=["aa.py"])
         cov.start()
-        self.import_module("ab")
+        self.import_local_file("ab")
         cov.stop()
         lines = cov.data.summary()
         self.assert_('aa.py' not in lines)
diff --git a/test/test_oddball.py b/test/test_oddball.py
index 33b4be9..f5d21aa 100644
--- a/test/test_oddball.py
+++ b/test/test_oddball.py
@@ -129,7 +129,7 @@ class PyexpatTest(CoverageTest):
 
         # Import the python file, executing it.
         cov.start()
-        self.import_module("outer")
+        self.import_local_file("outer")
         cov.stop()
 
         _, statements, missing, _ = cov.analysis("trydom.py")
@@ -192,7 +192,7 @@ class ExceptionTest(CoverageTest):
         # Import all the modules before starting coverage, so the def lines
         # won't be in all the results.
         for mod in "oops fly catch doit".split():
-            self.import_module(mod)
+            self.import_local_file(mod)
 
         # Each run nests the functions differently to get different
         # combinations of catching exceptions and letting them fly.