test: use import_helper

Author: deantvv

Lib/test/libregrtest/main.py

@@ -20,7 +20,7 @@
 from test.libregrtest.setup import setup_tests
 from test.libregrtest.utils import removepy, count, format_duration, printlist
 from test import support
-from test.support import os_helper
+from test.support import os_helper, import_helper
 
 
 # When tests are run from the Python build directory, it is best practice
@@ -412,7 +412,7 @@ def run_tests_sequential(self):
             # Unload the newly imported modules (best effort finalization)
             for module in sys.modules.keys():
                 if module not in save_modules and module.startswith("test."):
-                    support.unload(module)
+                    import_helper.unload(module)
 
         if previous_test:
             print(previous_test)

Lib/test/libregrtest/runtest.py

@@ -11,7 +11,7 @@
 import unittest
 
 from test import support
-from test.support import os_helper
+from test.support import os_helper, import_helper
 from test.libregrtest.refleak import dash_R, clear_caches
 from test.libregrtest.save_env import saved_test_environment
 from test.libregrtest.utils import print_warning
@@ -202,7 +202,7 @@ def _runtest_inner2(ns, test_name):
     abstest = get_abs_module(ns, test_name)
 
     # remove the module from sys.module to reload it if it was already imported
-    support.unload(abstest)
+    import_helper.unload(abstest)
 
     the_module = importlib.import_module(abstest)
 

Lib/test/support/script_helper.py

@@ -11,7 +11,8 @@
 import zipfile
 
 from importlib.util import source_from_cache
-from test.support import make_legacy_pyc, strip_python_stderr
+from test.support import strip_python_stderr
+from test.support.import_helper import make_legacy_pyc
 
 
 # Cached result of the expensive test performed in the function below.

Lib/test/test_asyncgen.py

@@ -2,7 +2,7 @@
 import types
 import unittest
 
-from test.support import import_module
+from test.support.import_helper import import_module
 asyncio = import_module("asyncio")
 
 

Lib/test/test_bisect.py

@@ -1,10 +1,11 @@
 import sys
 import unittest
 from test import support
+from test.support import import_helper
 from collections import UserList
 
-py_bisect = support.import_fresh_module('bisect', blocked=['_bisect'])
-c_bisect = support.import_fresh_module('bisect', fresh=['bisect'])
+py_bisect = import_helper.import_fresh_module('bisect', blocked=['_bisect'])
+c_bisect = import_helper.import_fresh_module('bisect', fresh=['bisect'])
 
 class Range(object):
     """A trivial range()-like object that has an insert() method."""

Lib/test/test_bytes.py

@@ -18,7 +18,7 @@
 import test.support
 import test.string_tests
 import test.list_tests
-from test.support import bigaddrspacetest, MAX_Py_ssize_t
+from test.support import bigaddrspacetest, MAX_Py_ssize_t, import_helper
 from test.support.script_helper import assert_python_failure
 
 
@@ -977,7 +977,7 @@ def test_translate(self):
         self.assertEqual(c, b'hllo')
 
     def test_sq_item(self):
-        _testcapi = test.support.import_module('_testcapi')
+        _testcapi = import_helper.import_module('_testcapi')
         obj = self.type2test((42,))
         with self.assertRaises(IndexError):
             _testcapi.sequence_getitem(obj, -2)
@@ -1034,8 +1034,8 @@ def __bytes__(self):
 
     # Test PyBytes_FromFormat()
     def test_from_format(self):
-        ctypes = test.support.import_module('ctypes')
-        _testcapi = test.support.import_module('_testcapi')
+        ctypes = import_helper.import_module('ctypes')
+        _testcapi = import_helper.import_module('_testcapi')
         from ctypes import pythonapi, py_object
         from ctypes import (
             c_int, c_uint,

Lib/test/test_cmd.py

@@ -9,6 +9,7 @@
 import unittest
 import io
 from test import support
+from test.support import import_helper
 
 class samplecmdclass(cmd.Cmd):
     """
@@ -225,7 +226,7 @@ def test_main(verbose=None):
     support.run_unittest(TestAlternateInput)
 
 def test_coverage(coverdir):
-    trace = support.import_module('trace')
+    trace = import_helper.import_module('trace')
     tracer=trace.Trace(ignoredirs=[sys.base_prefix, sys.base_exec_prefix,],
                         trace=0, count=1)
     tracer.run('import importlib; importlib.reload(cmd); test_main()')

Lib/test/test_cmd_line.py

@@ -718,7 +718,7 @@ def test_xdev(self):
 
     def check_warnings_filters(self, cmdline_option, envvar, use_pywarning=False):
         if use_pywarning:
-            code = ("import sys; from test.support import import_fresh_module; "
+            code = ("import sys; from test.support.import_helper import import_fresh_module; "
                     "warnings = import_fresh_module('warnings', blocked=['_warnings']); ")
         else:
             code = "import sys, warnings; "

Lib/test/test_cmd_line_script.py

@@ -17,7 +17,7 @@
 from test.support.script_helper import (
     make_pkg, make_script, make_zip_pkg, make_zip_script,
     assert_python_ok, assert_python_failure, spawn_python, kill_python)
-from test.support import os_helper
+from test.support import os_helper, import_helper
 
 verbose = support.verbose
 
@@ -238,7 +238,7 @@ def test_script_compiled(self):
             script_name = _make_test_script(script_dir, 'script')
             py_compile.compile(script_name, doraise=True)
             os.remove(script_name)
-            pyc_file = support.make_legacy_pyc(script_name)
+            pyc_file = import_helper.make_legacy_pyc(script_name)
             self._check_script(pyc_file, pyc_file,
                                pyc_file, script_dir, None,
                                importlib.machinery.SourcelessFileLoader)
@@ -255,7 +255,7 @@ def test_directory_compiled(self):
             script_name = _make_test_script(script_dir, '__main__')
             py_compile.compile(script_name, doraise=True)
             os.remove(script_name)
-            pyc_file = support.make_legacy_pyc(script_name)
+            pyc_file = import_helper.make_legacy_pyc(script_name)
             self._check_script(script_dir, pyc_file, script_dir,
                                script_dir, '',
                                importlib.machinery.SourcelessFileLoader)
@@ -355,7 +355,7 @@ def test_package_compiled(self):
             script_name = _make_test_script(pkg_dir, '__main__')
             compiled_name = py_compile.compile(script_name, doraise=True)
             os.remove(script_name)
-            pyc_file = support.make_legacy_pyc(script_name)
+            pyc_file = import_helper.make_legacy_pyc(script_name)
             self._check_script(["-m", "test_pkg"], pyc_file,
                                pyc_file, script_dir, 'test_pkg',
                                importlib.machinery.SourcelessFileLoader,

Lib/test/test_code_module.py

@@ -4,9 +4,9 @@
 from textwrap import dedent
 from contextlib import ExitStack
 from unittest import mock
-from test import support
+from test.support import import_helper
 
-code = support.import_module('code')
+code = import_helper.import_module('code')
 
 
 class TestInteractiveConsole(unittest.TestCase):

Lib/test/test_dbm.py

@@ -3,10 +3,10 @@
 import unittest
 import glob
 import test.support
-from test.support import os_helper
+from test.support import os_helper, import_helper
 
 # Skip tests if dbm module doesn't exist.
-dbm = test.support.import_module('dbm')
+dbm = import_helper.import_module('dbm')
 
 try:
     from dbm import ndbm
@@ -181,7 +181,7 @@ def setUp(self):
         self.filename = os_helper.TESTFN
         self.d = dbm.open(self.filename, 'c')
         self.d.close()
-        self.dbm = test.support.import_fresh_module('dbm')
+        self.dbm = import_helper.import_fresh_module('dbm')
 
     def test_keys(self):
         self.d = dbm.open(self.filename, 'c')

Lib/test/test_decimal.py

@@ -34,8 +34,9 @@
 import locale
 from test.support import (run_unittest, run_doctest, is_resource_enabled,
                           requires_IEEE_754, requires_docstrings)
-from test.support import (import_fresh_module, TestFailed,
-                          run_with_locale, cpython_only)
+from test.support import (TestFailed, run_with_locale,
+                          cpython_only)
+from test.support.import_helper import import_fresh_module
 import random
 import inspect
 import threading

Lib/test/test_exceptions.py

@@ -12,8 +12,9 @@
                           cpython_only, gc_collect,
                           no_tracing, script_helper,
                           SuppressCrashReport,
-                          import_module, check_warnings,)
+                          check_warnings,)
 from test.support.os_helper import TESTFN, unlink
+from test.support.import_helper import import_module
 from test import support
 
 class NaiveException(Exception):

Lib/test/test_functools.py

@@ -8,6 +8,7 @@
 from random import choice
 import sys
 from test import support
+from test.support import import_helper
 import threading
 import time
 import typing
@@ -18,10 +19,10 @@
 
 import functools
 
-py_functools = support.import_fresh_module('functools', blocked=['_functools'])
-c_functools = support.import_fresh_module('functools', fresh=['_functools'])
+py_functools = import_helper.import_fresh_module('functools', blocked=['_functools'])
+c_functools = import_helper.import_fresh_module('functools', fresh=['_functools'])
 
-decimal = support.import_fresh_module('decimal', fresh=['_decimal'])
+decimal = import_helper.import_fresh_module('decimal', fresh=['_decimal'])
 
 @contextlib.contextmanager
 def replaced_module(name, replacement):

Lib/test/test_future.py

@@ -4,6 +4,7 @@
 import ast
 import unittest
 from test import support
+from test.support import import_helper
 from textwrap import dedent
 import os
 import re
@@ -24,17 +25,17 @@ def check_syntax_error(self, err, basename, lineno, offset=1):
         self.assertEqual(err.offset, offset)
 
     def test_future1(self):
-        with support.CleanImport('future_test1'):
+        with import_helper.CleanImport('future_test1'):
             from test import future_test1
             self.assertEqual(future_test1.result, 6)
 
     def test_future2(self):
-        with support.CleanImport('future_test2'):
+        with import_helper.CleanImport('future_test2'):
             from test import future_test2
             self.assertEqual(future_test2.result, 6)
 
     def test_future3(self):
-        with support.CleanImport('test_future3'):
+        with import_helper.CleanImport('test_future3'):
             from test import test_future3
 
     def test_badfuture3(self):
@@ -120,7 +121,7 @@ def test_parserhack(self):
             self.fail("syntax error didn't occur")
 
     def test_multiple_features(self):
-        with support.CleanImport("test.test_future5"):
+        with import_helper.CleanImport("test.test_future5"):
             from test import test_future5
 
     def test_unicode_literals_exec(self):

Lib/test/test_gzip.py

@@ -11,10 +11,10 @@
 import unittest
 from subprocess import PIPE, Popen
 from test import support
-from test.support import _4G, bigmemtest, os_helper
+from test.support import _4G, bigmemtest, os_helper, import_helper
 from test.support.script_helper import assert_python_ok, assert_python_failure
 
-gzip = support.import_module('gzip')
+gzip = import_helper.import_module('gzip')
 
 data1 = b"""  int length=DEFAULTALLOC, err = Z_OK;
   PyObject *RetVal;

Lib/test/test_hashlib.py

@@ -18,7 +18,8 @@
 import unittest
 import warnings
 from test import support
-from test.support import _4G, bigmemtest, import_fresh_module
+from test.support import _4G, bigmemtest
+from test.support.import_helper import import_fresh_module
 from http.client import HTTPException
 
 # Were we compiled --with-pydebug or with #define Py_DEBUG?

Lib/test/test_heapq.py

@@ -5,11 +5,12 @@
 import doctest
 
 from test import support
+from test.support import import_helper
 from unittest import TestCase, skipUnless
 from operator import itemgetter
 
-py_heapq = support.import_fresh_module('heapq', blocked=['_heapq'])
-c_heapq = support.import_fresh_module('heapq', fresh=['_heapq'])
+py_heapq = import_helper.import_fresh_module('heapq', blocked=['_heapq'])
+c_heapq = import_helper.import_fresh_module('heapq', fresh=['_heapq'])
 
 # _heapq.nlargest/nsmallest are saved in heapq._nlargest/_smallest when
 # _heapq is imported, so check them there

Lib/test/test_imp.py

@@ -5,7 +5,7 @@
 import py_compile
 import sys
 from test import support
-from test.support import script_helper, os_helper
+from test.support import script_helper, os_helper, import_helper
 import unittest
 import warnings
 with warnings.catch_warnings():
@@ -211,7 +211,7 @@ def test_issue9319(self):
 
     def test_load_from_source(self):
         # Verify that the imp module can correctly load and find .py files
-        # XXX (ncoghlan): It would be nice to use support.CleanImport
+        # XXX (ncoghlan): It would be nice to use import_helper.CleanImport
         # here, but that breaks because the os module registers some
         # handlers in copy_reg on import. Since CleanImport doesn't
         # revert that registration, the module is left in a broken
@@ -408,12 +408,12 @@ def test_source(self):
             imp.reload(os)
 
     def test_extension(self):
-        with support.CleanImport('time'):
+        with import_helper.CleanImport('time'):
             import time
             imp.reload(time)
 
     def test_builtin(self):
-        with support.CleanImport('marshal'):
+        with import_helper.CleanImport('marshal'):
             import marshal
             imp.reload(marshal)
 

Lib/test/test_importlib/import_/test_packages.py

@@ -2,6 +2,7 @@
 import sys
 import unittest
 from test import support
+from test.support import import_helper
 
 
 class ParentModuleTests:
@@ -98,7 +99,7 @@ def module_injection():
                 try:
                     submodule = self.__import__(subname)
                 finally:
-                    support.unload(subname)
+                    import_helper.unload(subname)
 
 
 (Frozen_ParentTests,

Lib/test/test_importlib/source/test_file_loader.py

@@ -17,7 +17,7 @@
 import unittest
 import warnings
 
-from test.support import make_legacy_pyc, unload
+from test.support.import_helper import unload, make_legacy_pyc
 
 from test.test_py_compile import without_source_date_epoch
 from test.test_py_compile import SourceDateEpochTestMeta

Lib/test/test_importlib/source/test_finder.py

@@ -9,7 +9,7 @@
 import stat
 import sys
 import tempfile
-from test.support import make_legacy_pyc
+from test.support.import_helper import make_legacy_pyc
 import unittest
 import warnings