restore stable ABI symbols

Author: picnixz

Lib/test/test_capi/test_import.py

@@ -133,6 +133,15 @@ def test_importmodule(self):
         self.assertRaises(UnicodeDecodeError, importmodule, b'\xff')
         # CRASHES importmodule(NULL)
 
+    def test_importmodulenoblock(self):
+        # Test deprecated (stable ABI only) PyImport_ImportModuleNoBlock()
+        importmodulenoblock = _testlimitedcapi.PyImport_ImportModuleNoBlock
+        with check_warnings(('', DeprecationWarning)):
+            self.check_import_func(importmodulenoblock)
+            self.assertRaises(UnicodeDecodeError, importmodulenoblock, b'\xff')
+
+        # CRASHES importmodulenoblock(NULL)
+
     def check_frozen_import(self, import_frozen_module):
         # Importing a frozen module executes its code, so start by unloading
         # the module to execute the code in a new (temporary) module.

Lib/test/test_stable_abi_ctypes.py

@@ -886,6 +886,9 @@
     added = '3.2'
 [function.PyImport_ImportModuleLevel]
     added = '3.2'
+[function.PyImport_ImportModuleNoBlock]
+    added = '3.2'
+    abi_only = true
 [function.PyImport_ReloadModule]
     added = '3.2'
 [function.PyInterpreterState_Clear]

Misc/stable_abi.toml

@@ -108,6 +108,21 @@ pyimport_importmodule(PyObject *Py_UNUSED(module), PyObject *args)
 }
 
 
+/* Test PyImport_ImportModuleNoBlock() */
+static PyObject *
+pyimport_importmodulenoblock(PyObject *Py_UNUSED(module), PyObject *args)
+{
+    extern PyObject *PyImport_ImportModuleNoBlock(const char *name);
+
+    const char *name;
+    Py_ssize_t size;
+    if (!PyArg_ParseTuple(args, "z#", &name, &size)) {
+        return NULL;
+    }
+    return PyImport_ImportModuleNoBlock(name);
+}
+
+
 /* Test PyImport_ImportModuleEx() */
 static PyObject *
 pyimport_importmoduleex(PyObject *Py_UNUSED(module), PyObject *args)
@@ -268,6 +283,7 @@ static PyMethodDef test_methods[] = {
     {"PyImport_AddModuleRef", pyimport_addmoduleref, METH_VARARGS},
     {"PyImport_Import", pyimport_import, METH_O},
     {"PyImport_ImportModule", pyimport_importmodule, METH_VARARGS},
+    {"PyImport_ImportModuleNoBlock", pyimport_importmodulenoblock, METH_VARARGS},
     {"PyImport_ImportModuleEx", pyimport_importmoduleex, METH_VARARGS},
     {"PyImport_ImportModuleLevel", pyimport_importmodulelevel, METH_VARARGS},
     {"PyImport_ImportModuleLevelObject", pyimport_importmodulelevelobject, METH_VARARGS},

Modules/_testlimitedcapi/import.c

@@ -3426,6 +3426,30 @@ PyImport_ImportModule(const char *name)
 }
 
 
+/* Import a module without blocking
+ *
+ * At first it tries to fetch the module from sys.modules. If the module was
+ * never loaded before it loads it with PyImport_ImportModule() unless another
+ * thread holds the import lock. In the latter case the function raises an
+ * ImportError instead of blocking.
+ *
+ * Returns the module object with incremented ref count.
+ *
+ * Removed in 3.15, but kept for stable ABI compatibility.
+ */
+PyAPI_FUNC(PyObject *)
+PyImport_ImportModuleNoBlock(const char *name)
+{
+    if (PyErr_WarnEx(PyExc_DeprecationWarning,
+        "PyImport_ImportModuleNoBlock() is deprecated and scheduled for "
+        "removal in Python 3.15. Use PyImport_ImportModule() instead.", 1))
+    {
+        return NULL;
+    }
+    return PyImport_ImportModule(name);
+}
+
+
 /* Remove importlib frames from the traceback,
  * except in Verbose mode. */
 static void