[py3.12] Optimize some py files

gz83 · V8 LUCI CQ · commit a0d0d4fc4f19 · 2023-10-27T12:40:06.000Z
1. Remove the imp module and use its equivalent instead 2. Delete unused module imports Bug: chromium:1487454 Change-Id: I06fd342ba8e17f96ee2e55926cca0efded845b2a Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4983809 Reviewed-by: Michael Achenbach <machenbach@chromium.org> Commit-Queue: Ho Cheung <uioptt24@gmail.com> Cr-Commit-Position: refs/heads/main@{#90641}
diff --git a/test/test262/testcfg.py b/test/test262/testcfg.py
@@ -25,17 +25,13 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import imp
-import itertools
-import os
-import re
+import importlib.machinery
 import sys
 
 from pathlib import Path
 
 from testrunner.local import statusfile
 from testrunner.local import testsuite
-from testrunner.local import utils
 from testrunner.objects import testcase
 from testrunner.outproc import base as outproc
 from testrunner.outproc import test262
@@ -146,11 +142,12 @@ def _load_parse_test_record(self):
     root = TEST_262_TOOLS_ABS_PATH
     f = None
     try:
-      (f, pathname, description) = imp.find_module("parseTestRecord", [root])
-      module = imp.load_module("parseTestRecord", f, pathname, description)
+      loader = importlib.machinery.SourceFileLoader(
+          "parseTestRecord", f"{root}/parseTestRecord.py")
+      module = loader.load_module()
       return module.parseTestRecord
-    except:
-      print('Cannot load parseTestRecord')
+    except Exception as e:
+      print(f'Cannot load parseTestRecord: {e}')
       raise
     finally:
       if f:
diff --git a/tools/testrunner/local/testsuite.py b/tools/testrunner/local/testsuite.py
@@ -26,15 +26,14 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-import imp
+import importlib.machinery
 import itertools
 import os
 
 from contextlib import contextmanager
 from pathlib import Path
 
 from . import statusfile
-from . import utils
 from .variants import ALL_VARIANTS, ALL_VARIANT_FLAGS
 
 
@@ -232,12 +231,13 @@ def merge(self, test_generator):
 def _load_testsuite_module(name, root):
   f = None
   try:
-    (f, pathname, description) = imp.find_module("testcfg", [root])
-    yield imp.load_module(name + "_testcfg", f, pathname, description)
+    yield importlib.machinery.SourceFileLoader(
+        name + "_testcfg", f"{root}/testcfg.py").load_module()
   finally:
     if f:
       f.close()
 
+
 class TestSuite(object):
   @staticmethod
   def Load(ctx, root, test_config):
