[Python-checkins] bpo-41718: libregrtest runtest avoids import_helper (GH-24983)

[vstinner]

https://github.com/python/cpython/commit/0473fb222956063814b6beb5fd401f9eeaa8a56a
commit: 0473fb222956063814b6beb5fd401f9eeaa8a56a
branch: master
author: Victor Stinner <vstinner at python.org>
committer: vstinner <vstinner at python.org>
date: 2021-03-23T01:08:49+01:00
summary:

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

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

files:
M Lib/test/libregrtest/runtest.py

diff --git a/Lib/test/libregrtest/runtest.py b/Lib/test/libregrtest/runtest.py
index 470d7dd0351e0..927c470662970 100644
--- a/Lib/test/libregrtest/runtest.py
+++ b/Lib/test/libregrtest/runtest.py
@@ -11,7 +11,6 @@
 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)