remove PyImport_ImportModuleNoBlock

picnixz · picnixz · commit 1a68caa9050e · 2025-05-08T12:26:38.000+02:00
diff --git a/Doc/c-api/import.rst b/Doc/c-api/import.rst
@@ -16,19 +16,6 @@ Importing Modules
    This is a wrapper around :c:func:`PyImport_Import()` which takes a
    :c:expr:`const char *` as an argument instead of a :c:expr:`PyObject *`.
 
-.. c:function:: PyObject* PyImport_ImportModuleNoBlock(const char *name)
-
-   This function is a deprecated alias of :c:func:`PyImport_ImportModule`.
-
-   .. versionchanged:: 3.3
-      This function used to fail immediately when the import lock was held
-      by another thread.  In Python 3.3 though, the locking scheme switched
-      to per-module locks for most purposes, so this function's special
-      behaviour isn't needed anymore.
-
-   .. deprecated-removed:: 3.13 3.15
-      Use :c:func:`PyImport_ImportModule` instead.
-
 
 .. c:function:: PyObject* PyImport_ImportModuleEx(const char *name, PyObject *globals, PyObject *locals, PyObject *fromlist)
 
diff --git a/Doc/data/refcounts.dat b/Doc/data/refcounts.dat
@@ -1093,9 +1093,6 @@ PyImport_ImportModuleLevelObject:PyObject*:locals:0:???
 PyImport_ImportModuleLevelObject:PyObject*:fromlist:0:???
 PyImport_ImportModuleLevelObject:int:level::
 
-PyImport_ImportModuleNoBlock:PyObject*::+1:
-PyImport_ImportModuleNoBlock:const char*:name::
-
 PyImport_ReloadModule:PyObject*::+1:
 PyImport_ReloadModule:PyObject*:m:0:
 
diff --git a/Doc/data/stable_abi.dat b/Doc/data/stable_abi.dat
diff --git a/Doc/deprecations/c-api-pending-removal-in-3.15.rst b/Doc/deprecations/c-api-pending-removal-in-3.15.rst
@@ -2,8 +2,6 @@ Pending removal in Python 3.15
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 * The bundled copy of ``libmpdecimal``.
-* The :c:func:`PyImport_ImportModuleNoBlock`:
-  Use :c:func:`PyImport_ImportModule` instead.
 * :c:func:`PyWeakref_GetObject` and :c:func:`PyWeakref_GET_OBJECT`:
   Use :c:func:`PyWeakref_GetRef` instead. The `pythoncapi-compat project
   <https://github.com/python/pythoncapi-compat/>`__ can be used to get
diff --git a/Doc/whatsnew/3.15.rst b/Doc/whatsnew/3.15.rst
@@ -155,3 +155,5 @@ Deprecated C APIs
 Removed C APIs
 --------------
 
+* :c:func:`!PyImport_ImportModuleNoBlock`: use :c:func:`PyImport_ImportModule`
+  instead.
diff --git a/Include/import.h b/Include/import.h
@@ -51,9 +51,6 @@ PyAPI_FUNC(PyObject *) PyImport_AddModuleRef(
 PyAPI_FUNC(PyObject *) PyImport_ImportModule(
     const char *name            /* UTF-8 encoded string */
     );
-Py_DEPRECATED(3.13) PyAPI_FUNC(PyObject *) PyImport_ImportModuleNoBlock(
-    const char *name            /* UTF-8 encoded string */
-    );
 PyAPI_FUNC(PyObject *) PyImport_ImportModuleLevel(
     const char *name,           /* UTF-8 encoded string */
     PyObject *globals,
diff --git a/Lib/test/test_capi/test_import.py b/Lib/test/test_capi/test_import.py
@@ -133,15 +133,6 @@ def test_importmodule(self):
         self.assertRaises(UnicodeDecodeError, importmodule, b'\xff')
         # CRASHES importmodule(NULL)
 
-    def test_importmodulenoblock(self):
-        # Test deprecated 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.
diff --git a/Lib/test/test_stable_abi_ctypes.py b/Lib/test/test_stable_abi_ctypes.py
diff --git a/Misc/NEWS.d/next/C_API/2025-05-08-12-25-47.gh-issue-133644.Yb86Rm.rst b/Misc/NEWS.d/next/C_API/2025-05-08-12-25-47.gh-issue-133644.Yb86Rm.rst
@@ -0,0 +1,2 @@
+Remove deprecated :c:func:`!PyImport_ImportModuleNoBlock`. Use
+:c:func:`PyImport_ImportModule` instead. Patch by Bénédikt Tran.
diff --git a/Misc/stable_abi.toml b/Misc/stable_abi.toml
@@ -886,8 +886,6 @@
     added = '3.2'
 [function.PyImport_ImportModuleLevel]
     added = '3.2'
-[function.PyImport_ImportModuleNoBlock]
-    added = '3.2'
 [function.PyImport_ReloadModule]
     added = '3.2'
 [function.PyInterpreterState_Clear]
diff --git a/Modules/_testlimitedcapi/import.c b/Modules/_testlimitedcapi/import.c
@@ -108,23 +108,6 @@ pyimport_importmodule(PyObject *Py_UNUSED(module), PyObject *args)
 }
 
 
-/* Test PyImport_ImportModuleNoBlock() */
-static PyObject *
-pyimport_importmodulenoblock(PyObject *Py_UNUSED(module), PyObject *args)
-{
-    const char *name;
-    Py_ssize_t size;
-    if (!PyArg_ParseTuple(args, "z#", &name, &size)) {
-        return NULL;
-    }
-
-    _Py_COMP_DIAG_PUSH
-    _Py_COMP_DIAG_IGNORE_DEPR_DECLS
-    return PyImport_ImportModuleNoBlock(name);
-    _Py_COMP_DIAG_POP
-}
-
-
 /* Test PyImport_ImportModuleEx() */
 static PyObject *
 pyimport_importmoduleex(PyObject *Py_UNUSED(module), PyObject *args)
@@ -285,7 +268,6 @@ 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},
diff --git a/PC/python3dll.c b/PC/python3dll.c
diff --git a/Python/import.c b/Python/import.c
@@ -3426,28 +3426,6 @@ 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.
- */
-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

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Remove deprecated :c:func:`!PyImport_ImportModuleNoBlock`. Use
	`2`	+:c:func:`PyImport_ImportModule` instead. Patch by Bénédikt Tran.