pythongh-109721: Guard _testinernalcapi imports in tests

sobolevn · Sep 22, 2023 · 778e504 · 778e504
1 parent 34ddcc3
commit 778e504
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
@@ -799,6 +799,7 @@ def check_pythonmalloc(self, env_var, name):
  self.assertEqual(proc.stdout.rstrip(), name)
  self.assertEqual(proc.returncode, 0)
 
+ @support.cpython_only
  def test_pythonmalloc(self):
  # Test the PYTHONMALLOC environment variable
  pymalloc = support.with_pymalloc()

diff --git a/Lib/test/test_import/__init__.py b/Lib/test/test_import/__init__.py
@@ -22,7 +22,6 @@
 import types
 import unittest
 from unittest import mock
-import _testinternalcapi
 import _imp
 
 from test.support import os_helper
@@ -50,6 +49,10 @@
  import _xxsubinterpreters as _interpreters
 except ModuleNotFoundError:
  _interpreters = None
+try:
+ import _testinternalcapi
+except ImportError:
+ _testinternalcapi = None
 
 
 skip_if_dont_write_bytecode = unittest.skipIf(

diff --git a/Lib/test/test_opcache.py b/Lib/test/test_opcache.py
@@ -4,13 +4,14 @@
 import threading
 import types
 import unittest
-from test.support import threading_helper
-import _testinternalcapi
+from test.support import threading_helper, import_helper
+
+# Skip this module on other interpreters, it is cpython specific:
+_testinternalcapi = import_helper.import_module('_testinternalcapi')
 
 
 def disabling_optimizer(func):
  def wrapper(*args, **kwargs):
- import _testinternalcapi
  old_opt = _testinternalcapi.get_optimizer()
  _testinternalcapi.set_optimizer(None)
  try: