]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
bpo-41718: libregrtest runtest avoids import_helper (GH-24983)
authorVictor Stinner <vstinner@python.org>
Tue, 23 Mar 2021 00:08:49 +0000 (01:08 +0100)
committerGitHub <noreply@github.com>
Tue, 23 Mar 2021 00:08:49 +0000 (01:08 +0100)
Inline import_helper.unload() in libregrtest.runtest to avoid one
import.

Lib/test/libregrtest/runtest.py

index 470d7dd0351e0b164c109550835f2785db505626..927c47066297052a33175da6bd8dddd704c1b797 100644 (file)
@@ -11,7 +11,6 @@ import traceback
 import unittest
 
 from test import support
-from test.support import import_helper
 from test.support import os_helper
 from test.libregrtest.utils import clear_caches
 from test.libregrtest.save_env import saved_test_environment
@@ -222,7 +221,10 @@ 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
-    import_helper.unload(abstest)
+    try:
+        del sys.modules[abstest]
+    except KeyError:
+        pass
 
     the_module = importlib.import_module(abstest)