mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-14 18:59:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

gh-105396: Deprecate PyImport_ImportModuleNoBlock() function (#105397)

Browse source 
Deprecate the PyImport_ImportModuleNoBlock() function which is just
an alias to PyImport_ImportModule() since Python 3.3.
This commit is contained in:
Victor Stinner 2023-06-09 10:30:57 +02:00 • committed by GitHub
parent a5f23d4110
commit 3e525d2212
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Doc/c-api/import.rst
View file

@ -38,6 +38,9 @@ Importing Modules
to per-module locks for most purposes, so this function's special to per-module locks for most purposes, so this function's special
behaviour isn't needed anymore. 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) .. c:function:: PyObject* PyImport_ImportModuleEx(const char *name, PyObject *globals, PyObject *locals, PyObject *fromlist)

5
Doc/whatsnew/3.13.rst
View file

@ -407,6 +407,11 @@ Deprecated
(Contributed by Victor Stinner in :gh:`105145`.) (Contributed by Victor Stinner in :gh:`105145`.)
* Deprecate the :c:func:`PyImport_ImportModuleNoBlock` function which is just
an alias to :c:func:`PyImport_ImportModule` since Python 3.3.
Scheduled for removal in Python 3.15.
(Contributed by Victor Stinner in :gh:`105396`.)
Removed Removed
------- -------

2
Include/import.h
View file

@ -46,7 +46,7 @@ PyAPI_FUNC(PyObject *) PyImport_AddModule(
PyAPI_FUNC(PyObject *) PyImport_ImportModule( PyAPI_FUNC(PyObject *) PyImport_ImportModule(
const char *name /* UTF-8 encoded string */ const char *name /* UTF-8 encoded string */
); );
PyAPI_FUNC(PyObject *) PyImport_ImportModuleNoBlock( Py_DEPRECATED(3.13) PyAPI_FUNC(PyObject *) PyImport_ImportModuleNoBlock(
const char *name /* UTF-8 encoded string */ const char *name /* UTF-8 encoded string */
); );
PyAPI_FUNC(PyObject *) PyImport_ImportModuleLevel( PyAPI_FUNC(PyObject *) PyImport_ImportModuleLevel(

3
Misc/NEWS.d/next/C API/2023-06-06-17-43-28.gh-issue-105396.FQJG5B.rst Normal file
View file

@ -0,0 +1,3 @@
Deprecate the :c:func:`PyImport_ImportModuleNoBlock` function which is just
an alias to :c:func:`PyImport_ImportModule` since Python 3.3. Patch by
Victor Stinner.

6
Python/import.c
View file

@ -2439,6 +2439,12 @@ PyImport_ImportModule(const char *name)
PyObject * PyObject *
PyImport_ImportModuleNoBlock(const char *name) 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); return PyImport_ImportModule(name);
} }