bpo-44441: _PyImport_Fini2() resets PyImport_Inittab (GH-26874) (GH-26877)
Py_RunMain() now resets PyImport_Inittab to its initial value at
exit. It must be possible to call PyImport_AppendInittab() or
PyImport_ExtendInittab() at each Python initialization.
(cherry picked from commit 489699ca05bed5cfd10e847d8580840812b476cd)
diff --git a/Lib/test/test_embed.py b/Lib/test/test_embed.py
index 23cf297..f2cf4a6 100644
--- a/Lib/test/test_embed.py
+++ b/Lib/test/test_embed.py
@@ -30,6 +30,7 @@
# _PyCoreConfig_InitIsolatedConfig()
API_ISOLATED = 3
+INIT_LOOPS = 16
MAX_HASH_SEED = 4294967295
@@ -111,13 +112,13 @@ def run_repeated_init_and_subinterpreters(self):
self.assertEqual(err, "")
# The output from _testembed looks like this:
- # --- Pass 0 ---
+ # --- Pass 1 ---
# interp 0 <0x1cf9330>, thread state <0x1cf9700>: id(modules) = 139650431942728
# interp 1 <0x1d4f690>, thread state <0x1d35350>: id(modules) = 139650431165784
# interp 2 <0x1d5a690>, thread state <0x1d99ed0>: id(modules) = 139650413140368
# interp 3 <0x1d4f690>, thread state <0x1dc3340>: id(modules) = 139650412862200
# interp 0 <0x1cf9330>, thread state <0x1cf9700>: id(modules) = 139650431942728
- # --- Pass 1 ---
+ # --- Pass 2 ---
# ...
interp_pat = (r"^interp (\d+) <(0x[\dA-F]+)>, "
@@ -125,7 +126,7 @@ def run_repeated_init_and_subinterpreters(self):
r"id\(modules\) = ([\d]+)$")
Interp = namedtuple("Interp", "id interp tstate modules")
- numloops = 0
+ numloops = 1
current_run = []
for line in out.splitlines():
if line == "--- Pass {} ---".format(numloops):
@@ -159,6 +160,8 @@ def run_repeated_init_and_subinterpreters(self):
class EmbeddingTests(EmbeddingTestsMixin, unittest.TestCase):
+ maxDiff = 100 * 50
+
def test_subinterps_main(self):
for run in self.run_repeated_init_and_subinterpreters():
main = run[0]
@@ -194,6 +197,14 @@ def test_subinterps_distinct_state(self):
self.assertNotEqual(sub.tstate, main.tstate)
self.assertNotEqual(sub.modules, main.modules)
+ def test_repeated_init_and_inittab(self):
+ out, err = self.run_embedded_interpreter("test_repeated_init_and_inittab")
+ self.assertEqual(err, "")
+
+ lines = [f"--- Pass {i} ---" for i in range(1, INIT_LOOPS+1)]
+ lines = "\n".join(lines) + "\n"
+ self.assertEqual(out, lines)
+
def test_forced_io_encoding(self):
# Checks forced configuration of embedded interpreter IO streams
env = dict(os.environ, PYTHONIOENCODING="utf-8:surrogateescape")