Add test.support.import_helper.multi_interp_extensions_check().

ericsnowcurrently · ericsnowcurrently · commit ad3fe36f48bf · 2023-01-11T10:35:16.000-07:00
diff --git a/Lib/test/support/import_helper.py b/Lib/test/support/import_helper.py
@@ -105,6 +105,24 @@ def frozen_modules(enabled=True):
         _imp._override_frozen_modules_for_tests(0)
 
 
+@contextlib.contextmanager
+def multi_interp_extensions_check(enabled=True):
+    """Force legacy modules to be allowed in subinterpreters (or not).
+
+    ("legacy" == single-phase init)
+
+    This only applies to modules that haven't been imported yet.
+    It overrides the PyInterpreterConfig.check_multi_interp_extensions
+    setting (see support.run_in_subinterp_with_config() and
+    _xxsubinterpreters.create()).
+    """
+    old = _imp._override_multi_interp_extensions_check(1 if enabled else -1)
+    try:
+        yield
+    finally:
+        _imp._override_multi_interp_extensions_check(old)
+
+
 def import_fresh_module(name, fresh=(), blocked=(), *,
                         deprecated=False,
                         usefrozen=False,
diff --git a/Python/import.c b/Python/import.c
@@ -2388,8 +2388,9 @@ _imp__override_multi_interp_extensions_check_impl(PyObject *module,
 /*[clinic end generated code: output=3ff043af52bbf280 input=e086a2ea181f92ae]*/
 {
     PyInterpreterState *interp = _PyInterpreterState_GET();
+    int oldvalue = interp->override_multi_interp_extensions_check;
     interp->override_multi_interp_extensions_check = override;
-    Py_RETURN_NONE;
+    return PyLong_FromLong(oldvalue);
 }
 
 /* Common implementation for _imp.exec_dynamic and _imp.exec_builtin */

Original file line number	Diff line number	Diff line change
`@@ -2388,8 +2388,9 @@ _imp__override_multi_interp_extensions_check_impl(PyObject *module,`
`2388`	`2388`	`/[clinic end generated code: output=3ff043af52bbf280 input=e086a2ea181f92ae]/`
`2389`	`2389`	`{`
`2390`	`2390`	`PyInterpreterState *interp = _PyInterpreterState_GET();`
	`2391`	`+ int oldvalue = interp->override_multi_interp_extensions_check;`
`2391`	`2392`	`interp->override_multi_interp_extensions_check = override;`
`2392`		`- Py_RETURN_NONE;`
	`2393`	`+ return PyLong_FromLong(oldvalue);`
`2393`	`2394`	`}`
`2394`	`2395`
`2395`	`2396`	`/* Common implementation for _imp.exec_dynamic and _imp.exec_builtin */`