Add also PyImport_GetModuleAttr()

Author: vstinner

Doc/c-api/import.rst

@@ -327,15 +327,22 @@ Importing Modules
    initialization.
 
 
-.. c:function:: PyObject* PyImport_GetModuleAttrString(const char *mod_name, const char *attr_name)
+.. c:function:: PyObject* PyImport_GetModuleAttr(PyObject *mod_name, PyObject *attr_name)
 
    Import the module *mod_name* and get its attribute *attr_name*.
 
-   Names must be UTF-8 encoded strings.
+   Names must be Python :class:`str` objects.
 
    Helper function combining :c:func:`PyImport_Import` and
    :c:func:`PyObject_GetAttr`. For example, it can raise :exc:`ImportError` if
    the module is not found, and :exc:`AttributeError` if the attribute doesn't
    exist.
 
    .. versionadded:: 3.14
+
+.. c:function:: PyObject* PyImport_GetModuleAttrString(const char *mod_name, const char *attr_name)
+
+   Similar to :c:func:`PyImport_GetModuleAttr`, but names are UTF-8 encoded
+   strings instead of Python :class:`str` objects.
+
+   .. versionadded:: 3.14

Doc/whatsnew/3.14.rst

@@ -1301,7 +1301,8 @@ New features
   bit-packing Python version numbers.
   (Contributed by Petr Viktorin in :gh:`128629`.)
 
-* Add :c:func:`PyImport_GetModuleAttrString` helper function to import a module
+* Add :c:func:`PyImport_GetModuleAttr` and
+  :c:func:`PyImport_GetModuleAttrString` helper functions to import a module
   and get an attribute of the module.
   (Contributed by Victor Stinner in :gh:`128911`.)
 

Include/cpython/import.h

@@ -24,6 +24,9 @@ struct _frozen {
 
 PyAPI_DATA(const struct _frozen *) PyImport_FrozenModules;
 
+PyAPI_FUNC(PyObject*) PyImport_GetModuleAttr(
+    PyObject *mod_name,
+    PyObject *attr_name);
 PyAPI_FUNC(PyObject*) PyImport_GetModuleAttrString(
     const char *mod_name,
     const char *attr_name);

Include/internal/pycore_import.h

@@ -31,9 +31,6 @@ extern int _PyImport_FixupBuiltin(
     PyObject *modules
     );
 
-// Export for many shared extensions, like '_json'
-PyAPI_FUNC(PyObject*) _PyImport_GetModuleAttr(PyObject *, PyObject *);
-
 
 struct _import_runtime_state {
     /* The builtin modules (defined in config.c). */

Misc/NEWS.d/next/C_API/2025-01-16-12-47-01.gh-issue-128911.mHVJ4x.rst

@@ -1,2 +1,3 @@
-Add :c:func:`PyImport_GetModuleAttrString` helper function to import a
-module and get an attribute of the module. Patch by Victor Stinner.
+Add :c:func:`PyImport_GetModuleAttr` and :c:func:`PyImport_GetModuleAttrString`
+helper functions to import a module and get an attribute of the module. Patch
+by Victor Stinner.

Modules/_json.c

@@ -302,7 +302,7 @@ raise_errmsg(const char *msg, PyObject *s, Py_ssize_t end)
     /* Use JSONDecodeError exception to raise a nice looking ValueError subclass */
     _Py_DECLARE_STR(json_decoder, "json.decoder");
     PyObject *JSONDecodeError =
-         _PyImport_GetModuleAttr(&_Py_STR(json_decoder), &_Py_ID(JSONDecodeError));
+         PyImport_GetModuleAttr(&_Py_STR(json_decoder), &_Py_ID(JSONDecodeError));
     if (JSONDecodeError == NULL) {
         return;
     }

Python/import.c

@@ -4174,7 +4174,7 @@ _PyImport_FiniExternal(PyInterpreterState *interp)
 /******************/
 
 PyObject *
-_PyImport_GetModuleAttr(PyObject *modname, PyObject *attrname)
+PyImport_GetModuleAttr(PyObject *modname, PyObject *attrname)
 {
     PyObject *mod = PyImport_Import(modname);
     if (mod == NULL) {
@@ -4197,7 +4197,7 @@ PyImport_GetModuleAttrString(const char *modname, const char *attrname)
         Py_DECREF(pmodname);
         return NULL;
     }
-    PyObject *result = _PyImport_GetModuleAttr(pmodname, pattrname);
+    PyObject *result = PyImport_GetModuleAttr(pmodname, pattrname);
     Py_DECREF(pattrname);
     Py_DECREF(pmodname);
     return result;

Python/pylifecycle.c

@@ -2678,7 +2678,7 @@ create_stdio(const PyConfig *config, PyObject* io,
 
 #ifdef HAVE_WINDOWS_CONSOLE_IO
     /* Windows console IO is always UTF-8 encoded */
-    PyTypeObject *winconsoleio_type = (PyTypeObject *)_PyImport_GetModuleAttr(
+    PyTypeObject *winconsoleio_type = (PyTypeObject *)PyImport_GetModuleAttr(
             &_Py_ID(_io), &_Py_ID(_WindowsConsoleIO));
     if (winconsoleio_type == NULL) {
         goto error;