bpo-39355: Renamed module argument to pyModule in header files

Include/cpython/import.h

@@ -7,8 +7,8 @@ PyMODINIT_FUNC PyInit__imp(void);
 PyAPI_FUNC(int) _PyImport_IsInitialized(PyInterpreterState *);
 
 PyAPI_FUNC(PyObject *) _PyImport_GetModuleId(struct _Py_Identifier *name);
-PyAPI_FUNC(int) _PyImport_SetModule(PyObject *name, PyObject *module);
-PyAPI_FUNC(int) _PyImport_SetModuleString(const char *name, PyObject* module);
+PyAPI_FUNC(int) _PyImport_SetModule(PyObject *name, PyObject *pyModule);
+PyAPI_FUNC(int) _PyImport_SetModuleString(const char *name, PyObject *pyModule);
 
 PyAPI_FUNC(void) _PyImport_AcquireLock(void);
 PyAPI_FUNC(int) _PyImport_ReleaseLock(void);

Include/internal/pycore_pystate.h

@@ -141,7 +141,7 @@ extern void _PySignal_AfterFork(void);
 
 PyAPI_FUNC(int) _PyState_AddModule(
     PyThreadState *tstate,
-    PyObject* module,
+    PyObject *pyModule,
     struct PyModuleDef* def);
 
 

Include/modsupport.h

@@ -158,7 +158,7 @@ PyAPI_FUNC(int) PyModule_AddIntConstant(PyObject *, const char *, long);
 PyAPI_FUNC(int) PyModule_AddStringConstant(PyObject *, const char *, const char *);
 #if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03090000
 /* New in 3.9 */
-PyAPI_FUNC(int) PyModule_AddType(PyObject *module, PyTypeObject *type);
+PyAPI_FUNC(int) PyModule_AddType(PyObject *pyModule, PyTypeObject *type);
 #endif /* Py_LIMITED_API */
 #define PyModule_AddIntMacro(m, c) PyModule_AddIntConstant(m, #c, c)
 #define PyModule_AddStringMacro(m, c) PyModule_AddStringConstant(m, #c, c)
@@ -167,7 +167,7 @@ PyAPI_FUNC(int) PyModule_AddType(PyObject *module, PyTypeObject *type);
 /* New in 3.5 */
 PyAPI_FUNC(int) PyModule_SetDocString(PyObject *, const char *);
 PyAPI_FUNC(int) PyModule_AddFunctions(PyObject *, PyMethodDef *);
-PyAPI_FUNC(int) PyModule_ExecDef(PyObject *module, PyModuleDef *def);
+PyAPI_FUNC(int) PyModule_ExecDef(PyObject *pyModule, PyModuleDef *def);
 #endif
 
 #define Py_CLEANUP_SUPPORTED 0x20000

Include/warnings.h

@@ -32,22 +32,22 @@ PyAPI_FUNC(int) PyErr_WarnExplicitObject(
     PyObject *message,
     PyObject *filename,
     int lineno,
-    PyObject *module,
+    PyObject *pyModule,
     PyObject *registry);
 #endif
 PyAPI_FUNC(int) PyErr_WarnExplicit(
     PyObject *category,
     const char *message,        /* UTF-8 encoded string */
     const char *filename,       /* decoded from the filesystem encoding */
     int lineno,
-    const char *module,         /* UTF-8 encoded string */
+    const char *pyModule,         /* UTF-8 encoded string */
     PyObject *registry);
 
 #ifndef Py_LIMITED_API
 PyAPI_FUNC(int)
 PyErr_WarnExplicitFormat(PyObject *category,
                          const char *filename, int lineno,
-                         const char *module, PyObject *registry,
+                         const char *pyModule, PyObject *registry,
                          const char *format, ...);
 #endif
 

Modules/_io/clinic/_iomodule.c.h

@@ -125,12 +125,12 @@ PyDoc_STRVAR(_io_open__doc__,
     {"open", (PyCFunction)(void(*)(void))_io_open, METH_FASTCALL|METH_KEYWORDS, _io_open__doc__},
 
 static PyObject *
-_io_open_impl(PyObject *module, PyObject *file, const char *mode,
+_io_open_impl(PyObject *pyModule, PyObject *file, const char *mode,
               int buffering, const char *encoding, const char *errors,
               const char *newline, int closefd, PyObject *opener);
 
 static PyObject *
-_io_open(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_io_open(PyObject *pyModule, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     static const char * const _keywords[] = {"file", "mode", "buffering", "encoding", "errors", "newline", "closefd", "opener", NULL};
@@ -261,7 +261,7 @@ _io_open(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kw
     }
     opener = args[7];
 skip_optional_pos:
-    return_value = _io_open_impl(module, file, mode, buffering, encoding, errors, newline, closefd, opener);
+    return_value = _io_open_impl(pyModule, file, mode, buffering, encoding, errors, newline, closefd, opener);
 
 exit:
     return return_value;
@@ -286,10 +286,10 @@ PyDoc_STRVAR(_io_text_encoding__doc__,
     {"text_encoding", (PyCFunction)(void(*)(void))_io_text_encoding, METH_FASTCALL, _io_text_encoding__doc__},
 
 static PyObject *
-_io_text_encoding_impl(PyObject *module, PyObject *encoding, int stacklevel);
+_io_text_encoding_impl(PyObject *pyModule, PyObject *encoding, int stacklevel);
 
 static PyObject *
-_io_text_encoding(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
+_io_text_encoding(PyObject *pyModule, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     PyObject *encoding;
@@ -307,7 +307,7 @@ _io_text_encoding(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
         goto exit;
     }
 skip_optional:
-    return_value = _io_text_encoding_impl(module, encoding, stacklevel);
+    return_value = _io_text_encoding_impl(pyModule, encoding, stacklevel);
 
 exit:
     return return_value;
@@ -326,10 +326,10 @@ PyDoc_STRVAR(_io_open_code__doc__,
     {"open_code", (PyCFunction)(void(*)(void))_io_open_code, METH_FASTCALL|METH_KEYWORDS, _io_open_code__doc__},
 
 static PyObject *
-_io_open_code_impl(PyObject *module, PyObject *path);
+_io_open_code_impl(PyObject *pyModule, PyObject *path);
 
 static PyObject *
-_io_open_code(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_io_open_code(PyObject *pyModule, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     static const char * const _keywords[] = {"path", NULL};
@@ -349,7 +349,7 @@ _io_open_code(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObjec
         goto exit;
     }
     path = args[0];
-    return_value = _io_open_code_impl(module, path);
+    return_value = _io_open_code_impl(pyModule, path);
 
 exit:
     return return_value;

Modules/_multiprocessing/clinic/multiprocessing.c.h

@@ -13,18 +13,18 @@ PyDoc_STRVAR(_multiprocessing_closesocket__doc__,
     {"closesocket", (PyCFunction)_multiprocessing_closesocket, METH_O, _multiprocessing_closesocket__doc__},
 
 static PyObject *
-_multiprocessing_closesocket_impl(PyObject *module, HANDLE handle);
+_multiprocessing_closesocket_impl(PyObject *pyModule, HANDLE handle);
 
 static PyObject *
-_multiprocessing_closesocket(PyObject *module, PyObject *arg)
+_multiprocessing_closesocket(PyObject *pyModule, PyObject *arg)
 {
     PyObject *return_value = NULL;
     HANDLE handle;
 
     if (!PyArg_Parse(arg, ""F_HANDLE":closesocket", &handle)) {
         goto exit;
     }
-    return_value = _multiprocessing_closesocket_impl(module, handle);
+    return_value = _multiprocessing_closesocket_impl(pyModule, handle);
 
 exit:
     return return_value;
@@ -43,10 +43,10 @@ PyDoc_STRVAR(_multiprocessing_recv__doc__,
     {"recv", (PyCFunction)(void(*)(void))_multiprocessing_recv, METH_FASTCALL, _multiprocessing_recv__doc__},
 
 static PyObject *
-_multiprocessing_recv_impl(PyObject *module, HANDLE handle, int size);
+_multiprocessing_recv_impl(PyObject *pyModule, HANDLE handle, int size);
 
 static PyObject *
-_multiprocessing_recv(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
+_multiprocessing_recv(PyObject *pyModule, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     HANDLE handle;
@@ -56,7 +56,7 @@ _multiprocessing_recv(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
         &handle, &size)) {
         goto exit;
     }
-    return_value = _multiprocessing_recv_impl(module, handle, size);
+    return_value = _multiprocessing_recv_impl(pyModule, handle, size);
 
 exit:
     return return_value;
@@ -75,10 +75,10 @@ PyDoc_STRVAR(_multiprocessing_send__doc__,
     {"send", (PyCFunction)(void(*)(void))_multiprocessing_send, METH_FASTCALL, _multiprocessing_send__doc__},
 
 static PyObject *
-_multiprocessing_send_impl(PyObject *module, HANDLE handle, Py_buffer *buf);
+_multiprocessing_send_impl(PyObject *pyModule, HANDLE handle, Py_buffer *buf);
 
 static PyObject *
-_multiprocessing_send(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
+_multiprocessing_send(PyObject *pyModule, PyObject *const *args, Py_ssize_t nargs)
 {
     PyObject *return_value = NULL;
     HANDLE handle;
@@ -88,7 +88,7 @@ _multiprocessing_send(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
         &handle, &buf)) {
         goto exit;
     }
-    return_value = _multiprocessing_send_impl(module, handle, &buf);
+    return_value = _multiprocessing_send_impl(pyModule, handle, &buf);
 
 exit:
     /* Cleanup for buf */
@@ -110,10 +110,10 @@ PyDoc_STRVAR(_multiprocessing_sem_unlink__doc__,
     {"sem_unlink", (PyCFunction)_multiprocessing_sem_unlink, METH_O, _multiprocessing_sem_unlink__doc__},
 
 static PyObject *
-_multiprocessing_sem_unlink_impl(PyObject *module, const char *name);
+_multiprocessing_sem_unlink_impl(PyObject *pyModule, const char *name);
 
 static PyObject *
-_multiprocessing_sem_unlink(PyObject *module, PyObject *arg)
+_multiprocessing_sem_unlink(PyObject *pyModule, PyObject *arg)
 {
     PyObject *return_value = NULL;
     const char *name;
@@ -131,7 +131,7 @@ _multiprocessing_sem_unlink(PyObject *module, PyObject *arg)
         PyErr_SetString(PyExc_ValueError, "embedded null character");
         goto exit;
     }
-    return_value = _multiprocessing_sem_unlink_impl(module, name);
+    return_value = _multiprocessing_sem_unlink_impl(pyModule, name);
 
 exit:
     return return_value;

Modules/_multiprocessing/clinic/posixshmem.c.h

@@ -14,11 +14,11 @@ PyDoc_STRVAR(_posixshmem_shm_open__doc__,
     {"shm_open", (PyCFunction)(void(*)(void))_posixshmem_shm_open, METH_FASTCALL|METH_KEYWORDS, _posixshmem_shm_open__doc__},
 
 static int
-_posixshmem_shm_open_impl(PyObject *module, PyObject *path, int flags,
+_posixshmem_shm_open_impl(PyObject *pyModule, PyObject *path, int flags,
                           int mode);
 
 static PyObject *
-_posixshmem_shm_open(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_posixshmem_shm_open(PyObject *pyModule, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     static const char * const _keywords[] = {"path", "flags", "mode", NULL};
@@ -54,7 +54,7 @@ _posixshmem_shm_open(PyObject *module, PyObject *const *args, Py_ssize_t nargs,
         goto exit;
     }
 skip_optional_pos:
-    _return_value = _posixshmem_shm_open_impl(module, path, flags, mode);
+    _return_value = _posixshmem_shm_open_impl(pyModule, path, flags, mode);
     if ((_return_value == -1) && PyErr_Occurred()) {
         goto exit;
     }
@@ -82,10 +82,10 @@ PyDoc_STRVAR(_posixshmem_shm_unlink__doc__,
     {"shm_unlink", (PyCFunction)(void(*)(void))_posixshmem_shm_unlink, METH_FASTCALL|METH_KEYWORDS, _posixshmem_shm_unlink__doc__},
 
 static PyObject *
-_posixshmem_shm_unlink_impl(PyObject *module, PyObject *path);
+_posixshmem_shm_unlink_impl(PyObject *pyModule, PyObject *path);
 
 static PyObject *
-_posixshmem_shm_unlink(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
+_posixshmem_shm_unlink(PyObject *pyModule, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
 {
     PyObject *return_value = NULL;
     static const char * const _keywords[] = {"path", NULL};
@@ -105,7 +105,7 @@ _posixshmem_shm_unlink(PyObject *module, PyObject *const *args, Py_ssize_t nargs
         goto exit;
     }
     path = args[0];
-    return_value = _posixshmem_shm_unlink_impl(module, path);
+    return_value = _posixshmem_shm_unlink_impl(pyModule, path);
 
 exit:
     return return_value;