import_local_file is no longer backward

9 files changed, 25 insertions, 28 deletions

diff --git a/coverage/backward.py b/coverage/backward.py
index be1d00aa..007734c0 100644
--- a/coverage/backward.py
+++ b/coverage/backward.py
@@ -17,21 +17,3 @@ except AttributeError:
 else:
     # 3.6+
     path_types = (bytes, str, os.PathLike)
-
-
-def import_local_file(modname, modfile=None):
-    """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` is the file to
-    import if it isn't in the current directory.
-
-    """
-    from importlib.machinery import SourceFileLoader
-
-    if modfile is None:
-        modfile = modname + '.py'
-    # pylint: disable=no-value-for-parameter, deprecated-method
-    mod = SourceFileLoader(modname, modfile).load_module()
-
-    return mod
diff --git a/perf/perf_measure.py b/perf/perf_measure.py
index b903567c..ceccc814 100644
--- a/perf/perf_measure.py
+++ b/perf/perf_measure.py
@@ -14,9 +14,8 @@ import time
 from unittest_mixins.mixins import make_file
 
 import coverage
-from coverage.backward import import_local_file
 
-from tests.helpers import SuperModuleCleaner
+from tests.helpers import import_local_file, SuperModuleCleaner
 
 
 class StressResult(namedtuple('StressResult', ['files', 'calls', 'lines', 'baseline', 'covered'])):
diff --git a/tests/coveragetest.py b/tests/coveragetest.py
index 1cf6e217..9254840d 100644
--- a/tests/coveragetest.py
+++ b/tests/coveragetest.py
@@ -25,12 +25,12 @@ from unittest_mixins import (
 
 import coverage
 from coverage import env
-from coverage.backward import import_local_file
 from coverage.cmdline import CoverageScript
 from coverage.misc import StopEverything
 
 from tests.helpers import arcs_to_arcz_repr, arcz_to_arcs
 from tests.helpers import run_command, SuperModuleCleaner
+from tests.helpers import import_local_file
 
 
 # Status returns for the command line.
diff --git a/tests/helpers.py b/tests/helpers.py
index 90dade4d..2e6a03c5 100644
--- a/tests/helpers.py
+++ b/tests/helpers.py
@@ -45,6 +45,24 @@ def run_command(cmd):
     return status, output
 
 
+def import_local_file(modname, modfile=None):
+    """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` is the file to
+    import if it isn't in the current directory.
+
+    """
+    from importlib.machinery import SourceFileLoader
+
+    if modfile is None:
+        modfile = modname + '.py'
+    # pylint: disable=no-value-for-parameter, deprecated-method
+    mod = SourceFileLoader(modname, modfile).load_module()
+
+    return mod
+
+
 class CheckUniqueFilenames(object):
     """Asserts the uniqueness of file names passed to a function."""
     def __init__(self, wrapped):
diff --git a/tests/test_api.py b/tests/test_api.py
index af4d413e..dd2a2e01 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -17,12 +17,12 @@ from unittest_mixins import change_dir
 
 import coverage
 from coverage import env
-from coverage.backward import import_local_file
 from coverage.data import line_counts
 from coverage.files import abs_file
 from coverage.misc import CoverageException
 
 from tests.coveragetest import CoverageTest, CoverageTestMethodsMixin, TESTS_DIR, UsingModulesMixin
+from tests.helpers import import_local_file
 
 
 class ApiTest(CoverageTest):
diff --git a/tests/test_concurrency.py b/tests/test_concurrency.py
index bf5583fe..2e0bf5c4 100644
--- a/tests/test_concurrency.py
+++ b/tests/test_concurrency.py
@@ -14,12 +14,11 @@ from flaky import flaky
 
 import coverage
 from coverage import env
-from coverage.backward import import_local_file
 from coverage.data import line_counts
 from coverage.files import abs_file
 
 from tests.coveragetest import CoverageTest
-from tests.helpers import remove_files
+from tests.helpers import import_local_file, remove_files
 
 
 # These libraries aren't always available, we'll skip tests if they aren't.
diff --git a/tests/test_oddball.py b/tests/test_oddball.py
index f8635821..70bed767 100644
--- a/tests/test_oddball.py
+++ b/tests/test_oddball.py
@@ -11,10 +11,10 @@ import pytest
 
 import coverage
 from coverage import env
-from coverage.backward import import_local_file
 from coverage.files import abs_file
 
 from tests.coveragetest import CoverageTest
+from tests.helpers import import_local_file
 from tests import osinfo
 
 
diff --git a/tests/test_plugins.py b/tests/test_plugins.py
index b90f94ca..5c38019b 100644
--- a/tests/test_plugins.py
+++ b/tests/test_plugins.py
@@ -10,7 +10,6 @@ from xml.etree import ElementTree
 
 import coverage
 from coverage import env
-from coverage.backward import import_local_file
 from coverage.data import line_counts
 from coverage.control import Plugins
 from coverage.misc import CoverageException
@@ -18,7 +17,7 @@ from coverage.misc import CoverageException
 import coverage.plugin
 
 from tests.coveragetest import CoverageTest
-from tests.helpers import CheckUniqueFilenames
+from tests.helpers import CheckUniqueFilenames, import_local_file
 
 
 class FakeConfig(object):
diff --git a/tests/test_xml.py b/tests/test_xml.py
index 93fee9b7..86d9491a 100644
--- a/tests/test_xml.py
+++ b/tests/test_xml.py
@@ -12,11 +12,11 @@ from xml.etree import ElementTree
 from unittest_mixins import change_dir
 
 import coverage
-from coverage.backward import import_local_file
 from coverage.files import abs_file
 
 from tests.coveragetest import CoverageTest
 from tests.goldtest import compare, gold_path
+from tests.helpers import import_local_file
 
 
 class XmlTestHelpers(CoverageTest):