From: Victor Stinner <vstinner@python.org>
Date: Tue, 23 Mar 2021 00:08:49 +0000 (+0100)
Subject: bpo-41718: libregrtest runtest avoids import_helper (GH-24983)
X-Git-Tag: v3.10.0a7~108
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0473fb222956063814b6beb5fd401f9eeaa8a56a;p=thirdparty%2FPython%2Fcpython.git

bpo-41718: libregrtest runtest avoids import_helper (GH-24983)

Inline import_helper.unload() in libregrtest.runtest to avoid one
import.
---

diff --git a/Lib/test/libregrtest/runtest.py b/Lib/test/libregrtest/runtest.py
index 470d7dd0351e..927c47066297 100644
--- a/Lib/test/libregrtest/runtest.py
+++ b/Lib/test/libregrtest/runtest.py
@@ -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)