Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
AliyevH wants to merge 2 commits into from
Closed

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0fb3b7d
bpo-39355: Renamed module argument to pyModule in header files
AliyevH Sep 15, 2021
2c12e6a
bpo-39355: Renamed module argument to pyModule in header files - 2nd
AliyevH Sep 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
bpo-39355: Renamed module argument to pyModule in header files - 2nd
  • Loading branch information
@AliyevH
AliyevH committed Sep 15, 2021
commit 2c12e6a94a3bd235902bcf0ba796b0236cd2e4af
18 changes: 9 additions & 9 deletions Modules/_io/clinic/_iomodule.c.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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};
Expand All @@ -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;
Expand Down
24 changes: 12 additions & 12 deletions Modules/_multiprocessing/clinic/multiprocessing.c.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand All @@ -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 */
Expand All @@ -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;
Expand All @@ -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;
Expand Down
12 changes: 6 additions & 6 deletions Modules/_multiprocessing/clinic/posixshmem.c.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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};
Expand All @@ -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;
Expand Down
42 changes: 21 additions & 21 deletions Modules/_sqlite/clinic/module.c.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ PyDoc_STRVAR(pysqlite_connect__doc__,
{"connect", (PyCFunction)(void(*)(void))pysqlite_connect, METH_FASTCALL|METH_KEYWORDS, pysqlite_connect__doc__},

static PyObject *
pysqlite_connect_impl(PyObject *module, PyObject *database, double timeout,
pysqlite_connect_impl(PyObject *pyModule, PyObject *database, double timeout,
int detect_types, PyObject *isolation_level,
int check_same_thread, PyObject *factory,
int cached_statements, int uri);

static PyObject *
pysqlite_connect(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
pysqlite_connect(PyObject *pyModule, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
{
PyObject *return_value = NULL;
static const char * const _keywords[] = {"database", "timeout", "detect_types", "isolation_level", "check_same_thread", "factory", "cached_statements", "uri", NULL};
Expand Down Expand Up @@ -108,7 +108,7 @@ pysqlite_connect(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyOb
goto exit;
}
skip_optional_pos:
return_value = pysqlite_connect_impl(module, database, timeout, detect_types, isolation_level, check_same_thread, factory, cached_statements, uri);
return_value = pysqlite_connect_impl(pyModule, database, timeout, detect_types, isolation_level, check_same_thread, factory, cached_statements, uri);

exit:
return return_value;
Expand All @@ -124,10 +124,10 @@ PyDoc_STRVAR(pysqlite_complete_statement__doc__,
{"complete_statement", (PyCFunction)(void(*)(void))pysqlite_complete_statement, METH_FASTCALL|METH_KEYWORDS, pysqlite_complete_statement__doc__},

static PyObject *
pysqlite_complete_statement_impl(PyObject *module, const char *statement);
pysqlite_complete_statement_impl(PyObject *pyModule, const char *statement);

static PyObject *
pysqlite_complete_statement(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
pysqlite_complete_statement(PyObject *pyModule, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
{
PyObject *return_value = NULL;
static const char * const _keywords[] = {"statement", NULL};
Expand All @@ -152,7 +152,7 @@ pysqlite_complete_statement(PyObject *module, PyObject *const *args, Py_ssize_t
PyErr_SetString(PyExc_ValueError, "embedded null character");
goto exit;
}
return_value = pysqlite_complete_statement_impl(module, statement);
return_value = pysqlite_complete_statement_impl(pyModule, statement);

exit:
return return_value;
Expand All @@ -170,10 +170,10 @@ PyDoc_STRVAR(pysqlite_enable_shared_cache__doc__,
{"enable_shared_cache", (PyCFunction)(void(*)(void))pysqlite_enable_shared_cache, METH_FASTCALL|METH_KEYWORDS, pysqlite_enable_shared_cache__doc__},

static PyObject *
pysqlite_enable_shared_cache_impl(PyObject *module, int do_enable);
pysqlite_enable_shared_cache_impl(PyObject *pyModule, int do_enable);

static PyObject *
pysqlite_enable_shared_cache(PyObject *module, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
pysqlite_enable_shared_cache(PyObject *pyModule, PyObject *const *args, Py_ssize_t nargs, PyObject *kwnames)
{
PyObject *return_value = NULL;
static const char * const _keywords[] = {"do_enable", NULL};
Expand All @@ -189,7 +189,7 @@ pysqlite_enable_shared_cache(PyObject *module, PyObject *const *args, Py_ssize_t
if (do_enable == -1 && PyErr_Occurred()) {
goto exit;
}
return_value = pysqlite_enable_shared_cache_impl(module, do_enable);
return_value = pysqlite_enable_shared_cache_impl(pyModule, do_enable);

exit:
return return_value;
Expand All @@ -205,11 +205,11 @@ PyDoc_STRVAR(pysqlite_register_adapter__doc__,
{"register_adapter", (PyCFunction)(void(*)(void))pysqlite_register_adapter, METH_FASTCALL, pysqlite_register_adapter__doc__},

static PyObject *
pysqlite_register_adapter_impl(PyObject *module, PyTypeObject *type,
pysqlite_register_adapter_impl(PyObject *pyModule, PyTypeObject *type,
PyObject *caster);

static PyObject *
pysqlite_register_adapter(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
pysqlite_register_adapter(PyObject *pyModule, PyObject *const *args, Py_ssize_t nargs)
{
PyObject *return_value = NULL;
PyTypeObject *type;
Expand All @@ -220,7 +220,7 @@ pysqlite_register_adapter(PyObject *module, PyObject *const *args, Py_ssize_t na
}
type = (PyTypeObject *)args[0];
caster = args[1];
return_value = pysqlite_register_adapter_impl(module, type, caster);
return_value = pysqlite_register_adapter_impl(pyModule, type, caster);

exit:
return return_value;
Expand All @@ -236,11 +236,11 @@ PyDoc_STRVAR(pysqlite_register_converter__doc__,
{"register_converter", (PyCFunction)(void(*)(void))pysqlite_register_converter, METH_FASTCALL, pysqlite_register_converter__doc__},

static PyObject *
pysqlite_register_converter_impl(PyObject *module, PyObject *orig_name,
pysqlite_register_converter_impl(PyObject *pyModule, PyObject *orig_name,
PyObject *callable);

static PyObject *
pysqlite_register_converter(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
pysqlite_register_converter(PyObject *pyModule, PyObject *const *args, Py_ssize_t nargs)
{
PyObject *return_value = NULL;
PyObject *orig_name;
Expand All @@ -258,7 +258,7 @@ pysqlite_register_converter(PyObject *module, PyObject *const *args, Py_ssize_t
}
orig_name = args[0];
callable = args[1];
return_value = pysqlite_register_converter_impl(module, orig_name, callable);
return_value = pysqlite_register_converter_impl(pyModule, orig_name, callable);

exit:
return return_value;
Expand All @@ -274,10 +274,10 @@ PyDoc_STRVAR(pysqlite_enable_callback_trace__doc__,
{"enable_callback_tracebacks", (PyCFunction)pysqlite_enable_callback_trace, METH_O, pysqlite_enable_callback_trace__doc__},

static PyObject *
pysqlite_enable_callback_trace_impl(PyObject *module, int enable);
pysqlite_enable_callback_trace_impl(PyObject *pyModule, int enable);

static PyObject *
pysqlite_enable_callback_trace(PyObject *module, PyObject *arg)
pysqlite_enable_callback_trace(PyObject *pyModule, PyObject *arg)
{
PyObject *return_value = NULL;
int enable;
Expand All @@ -286,7 +286,7 @@ pysqlite_enable_callback_trace(PyObject *module, PyObject *arg)
if (enable == -1 && PyErr_Occurred()) {
goto exit;
}
return_value = pysqlite_enable_callback_trace_impl(module, enable);
return_value = pysqlite_enable_callback_trace_impl(pyModule, enable);

exit:
return return_value;
Expand All @@ -302,11 +302,11 @@ PyDoc_STRVAR(pysqlite_adapt__doc__,
{"adapt", (PyCFunction)(void(*)(void))pysqlite_adapt, METH_FASTCALL, pysqlite_adapt__doc__},

static PyObject *
pysqlite_adapt_impl(PyObject *module, PyObject *obj, PyObject *proto,
pysqlite_adapt_impl(PyObject *pyModule, PyObject *obj, PyObject *proto,
PyObject *alt);

static PyObject *
pysqlite_adapt(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
pysqlite_adapt(PyObject *pyModule, PyObject *const *args, Py_ssize_t nargs)
{
PyObject *return_value = NULL;
PyObject *obj;
Expand All @@ -326,7 +326,7 @@ pysqlite_adapt(PyObject *module, PyObject *const *args, Py_ssize_t nargs)
}
alt = args[2];
skip_optional:
return_value = pysqlite_adapt_impl(module, obj, proto, alt);
return_value = pysqlite_adapt_impl(pyModule, obj, proto, alt);

exit:
return return_value;
Expand Down
2 changes: 1 addition & 1 deletion Modules/_sqlite/connection.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,6 @@ int pysqlite_connection_register_cursor(pysqlite_Connection* connection, PyObjec
int pysqlite_check_thread(pysqlite_Connection* self);
int pysqlite_check_connection(pysqlite_Connection* con);

int pysqlite_connection_setup_types(PyObject *module);
int pysqlite_connection_setup_types(PyObject *pyModule);

#endif