gh-128911: Add PyImport_GetModuleAttrString() function

Remove "pycore_import.h" includes, no longer needed.

Author: vstinner

Doc/c-api/import.rst

@@ -325,3 +325,17 @@ Importing Modules
    If Python is initialized multiple times, :c:func:`PyImport_AppendInittab` or
    :c:func:`PyImport_ExtendInittab` must be called before each Python
    initialization.
+
+
+.. c:function:: PyObject* PyImport_GetModuleAttrString(const char *mod_name, const char *attr_name)
+
+   Import the module *mod_name* and get its attribute *attr_name*.
+
+   Names must be UTF-8 encoded strings.
+
+   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

Doc/data/refcounts.dat

@@ -3052,3 +3052,7 @@ _Py_c_quot:Py_complex:divisor::
 _Py_c_sum:Py_complex:::
 _Py_c_sum:Py_complex:left::
 _Py_c_sum:Py_complex:right::
+
+PyImport_GetModuleAttrString:PyObject*::+1:
+PyImport_GetModuleAttrString:const char *:mod_name::
+PyImport_GetModuleAttrString:const char *:attr_name::

Doc/whatsnew/3.14.rst

@@ -1301,6 +1301,10 @@ 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
+  and get an attribute of the module.
+  (Contributed by Victor Stinner in :gh:`128911`.)
+
 
 Porting to Python 3.14
 ----------------------

Include/cpython/import.h

@@ -23,3 +23,7 @@ struct _frozen {
    collection of frozen modules: */
 
 PyAPI_DATA(const struct _frozen *) PyImport_FrozenModules;
+
+PyAPI_FUNC(PyObject*) PyImport_GetModuleAttrString(
+    const char *mod_name,
+    const char *attr_name);

Include/internal/pycore_import.h

@@ -34,9 +34,6 @@ extern int _PyImport_FixupBuiltin(
 // Export for many shared extensions, like '_json'
 PyAPI_FUNC(PyObject*) _PyImport_GetModuleAttr(PyObject *, PyObject *);
 
-// Export for many shared extensions, like '_datetime'
-PyAPI_FUNC(PyObject*) _PyImport_GetModuleAttrString(const char *, const char *);
-
 
 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

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

Modules/_ctypes/callbacks.c

@@ -492,7 +492,7 @@ long Call_GetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
     if (context == NULL)
         context = PyUnicode_InternFromString("_ctypes.DllGetClassObject");
 
-    func = _PyImport_GetModuleAttrString("ctypes", "DllGetClassObject");
+    func = PyImport_GetModuleAttrString("ctypes", "DllGetClassObject");
     if (!func) {
         PyErr_WriteUnraisable(context ? context : Py_None);
         /* There has been a warning before about this already */

Modules/_ctypes/stgdict.c

@@ -257,7 +257,7 @@ PyCStructUnionType_update_stginfo(PyObject *type, PyObject *fields, int isStruct
         goto error;
     }
 
-    PyObject *layout_func = _PyImport_GetModuleAttrString("ctypes._layout",
+    PyObject *layout_func = PyImport_GetModuleAttrString("ctypes._layout",
                                                           "get_layout");
     if (!layout_func) {
         goto error;

Modules/_cursesmodule.c

@@ -226,7 +226,7 @@ _PyCursesCheckFunction(int called, const char *funcname)
     if (called == TRUE) {
         return 1;
     }
-    PyObject *exc = _PyImport_GetModuleAttrString("_curses", "error");
+    PyObject *exc = PyImport_GetModuleAttrString("_curses", "error");
     if (exc != NULL) {
         PyErr_Format(exc, "must call %s() first", funcname);
         Py_DECREF(exc);

Modules/_datetimemodule.c

@@ -1839,7 +1839,7 @@ wrap_strftime(PyObject *object, PyObject *format, PyObject *timetuple,
     assert(object && format && timetuple);
     assert(PyUnicode_Check(format));
 
-    PyObject *strftime = _PyImport_GetModuleAttrString("time", "strftime");
+    PyObject *strftime = PyImport_GetModuleAttrString("time", "strftime");
     if (strftime == NULL) {
         return NULL;
     }
@@ -2021,7 +2021,7 @@ static PyObject *
 time_time(void)
 {
     PyObject *result = NULL;
-    PyObject *time = _PyImport_GetModuleAttrString("time", "time");
+    PyObject *time = PyImport_GetModuleAttrString("time", "time");
 
     if (time != NULL) {
         result = PyObject_CallNoArgs(time);
@@ -2039,7 +2039,7 @@ build_struct_time(int y, int m, int d, int hh, int mm, int ss, int dstflag)
     PyObject *struct_time;
     PyObject *result;
 
-    struct_time = _PyImport_GetModuleAttrString("time", "struct_time");
+    struct_time = PyImport_GetModuleAttrString("time", "struct_time");
     if (struct_time == NULL) {
         return NULL;
     }