Skip to content

bpo-36876: Use a consistent variable name for kwlist. #13531

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
wants to merge 1 commit into from
Closed

bpo-36876: Use a consistent variable name for kwlist. #13531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions Modules/_bisectmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,15 @@ bisect_right(PyObject *self, PyObject *args, PyObject *kw)
Py_ssize_t lo = 0;
Py_ssize_t hi = -1;
Py_ssize_t index;
static char *keywords[] = {"a", "x", "lo", "hi", NULL};
static char *kwlist[] = {"a", "x", "lo", "hi", NULL};

if (kw == NULL && PyTuple_GET_SIZE(args) == 2) {
list = PyTuple_GET_ITEM(args, 0);
item = PyTuple_GET_ITEM(args, 1);
}
else {
if (!PyArg_ParseTupleAndKeywords(args, kw, "OO|nn:bisect_right",
keywords, &list, &item, &lo, &hi))
kwlist, &list, &item, &lo, &hi))
return NULL;
}
index = internal_bisect_right(list, item, lo, hi);
Expand Down Expand Up @@ -87,15 +87,15 @@ insort_right(PyObject *self, PyObject *args, PyObject *kw)
Py_ssize_t lo = 0;
Py_ssize_t hi = -1;
Py_ssize_t index;
static char *keywords[] = {"a", "x", "lo", "hi", NULL};
static char *kwlist[] = {"a", "x", "lo", "hi", NULL};

if (kw == NULL && PyTuple_GET_SIZE(args) == 2) {
list = PyTuple_GET_ITEM(args, 0);
item = PyTuple_GET_ITEM(args, 1);
}
else {
if (!PyArg_ParseTupleAndKeywords(args, kw, "OO|nn:insort_right",
keywords, &list, &item, &lo, &hi))
kwlist, &list, &item, &lo, &hi))
return NULL;
}
index = internal_bisect_right(list, item, lo, hi);
Expand Down Expand Up @@ -168,15 +168,15 @@ bisect_left(PyObject *self, PyObject *args, PyObject *kw)
Py_ssize_t lo = 0;
Py_ssize_t hi = -1;
Py_ssize_t index;
static char *keywords[] = {"a", "x", "lo", "hi", NULL};
static char *kwlist[] = {"a", "x", "lo", "hi", NULL};

if (kw == NULL && PyTuple_GET_SIZE(args) == 2) {
list = PyTuple_GET_ITEM(args, 0);
item = PyTuple_GET_ITEM(args, 1);
}
else {
if (!PyArg_ParseTupleAndKeywords(args, kw, "OO|nn:bisect_left",
keywords, &list, &item, &lo, &hi))
kwlist, &list, &item, &lo, &hi))
return NULL;
}
index = internal_bisect_left(list, item, lo, hi);
Expand Down Expand Up @@ -204,14 +204,14 @@ insort_left(PyObject *self, PyObject *args, PyObject *kw)
Py_ssize_t lo = 0;
Py_ssize_t hi = -1;
Py_ssize_t index;
static char *keywords[] = {"a", "x", "lo", "hi", NULL};
static char *kwlist[] = {"a", "x", "lo", "hi", NULL};

if (kw == NULL && PyTuple_GET_SIZE(args) == 2) {
list = PyTuple_GET_ITEM(args, 0);
item = PyTuple_GET_ITEM(args, 1);
} else {
if (!PyArg_ParseTupleAndKeywords(args, kw, "OO|nn:insort_left",
keywords, &list, &item, &lo, &hi))
kwlist, &list, &item, &lo, &hi))
return NULL;
}
index = internal_bisect_left(list, item, lo, hi);
Expand Down
36 changes: 18 additions & 18 deletions Modules/_datetimemodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2432,13 +2432,13 @@ delta_new(PyTypeObject *type, PyObject *args, PyObject *kw)
PyObject *y = NULL; /* temp sum of microseconds */
double leftover_us = 0.0;

static char *keywords[] = {
static char *kwlist[] = {
"days", "seconds", "microseconds", "milliseconds",
"minutes", "hours", "weeks", NULL
};

if (PyArg_ParseTupleAndKeywords(args, kw, "|OOOOOOO:__new__",
keywords,
kwlist,
&day, &second, &us,
&ms, &minute, &hour, &week) == 0)
goto Done;
Expand Down Expand Up @@ -3007,13 +3007,13 @@ date_fromisoformat(PyObject *cls, PyObject *dtstr)
static PyObject *
date_fromisocalendar(PyObject *cls, PyObject *args, PyObject *kw)
{
static char *keywords[] = {
static char *kwlist[] = {
"year", "week", "day", NULL
};

int year, week, day;
if (PyArg_ParseTupleAndKeywords(args, kw, "iii:fromisocalendar",
keywords,
kwlist,
&year, &week, &day) == 0) {
if (PyErr_ExceptionMatches(PyExc_OverflowError)) {
PyErr_Format(PyExc_ValueError,
Expand Down Expand Up @@ -3183,9 +3183,9 @@ date_strftime(PyDateTime_Date *self, PyObject *args, PyObject *kw)
PyObject *tuple;
PyObject *format;
_Py_IDENTIFIER(timetuple);
static char *keywords[] = {"format", NULL};
static char *kwlist[] = {"format", NULL};

if (! PyArg_ParseTupleAndKeywords(args, kw, "U:strftime", keywords,
if (! PyArg_ParseTupleAndKeywords(args, kw, "U:strftime", kwlist,
&format))
return NULL;

Expand Down Expand Up @@ -4184,7 +4184,7 @@ time_isoformat(PyDateTime_Time *self, PyObject *args, PyObject *kw)
{
char buf[100];
char *timespec = NULL;
static char *keywords[] = {"timespec", NULL};
static char *kwlist[] = {"timespec", NULL};
PyObject *result;
int us = TIME_GET_MICROSECOND(self);
static char *specs[][2] = {
Expand All @@ -4196,7 +4196,7 @@ time_isoformat(PyDateTime_Time *self, PyObject *args, PyObject *kw)
};
size_t given_spec;

if (!PyArg_ParseTupleAndKeywords(args, kw, "|s:isoformat", keywords, &timespec))
if (!PyArg_ParseTupleAndKeywords(args, kw, "|s:isoformat", kwlist, &timespec))
return NULL;

if (timespec == NULL || strcmp(timespec, "auto") == 0) {
Expand Down Expand Up @@ -4250,9 +4250,9 @@ time_strftime(PyDateTime_Time *self, PyObject *args, PyObject *kw)
PyObject *result;
PyObject *tuple;
PyObject *format;
static char *keywords[] = {"format", NULL};
static char *kwlist[] = {"format", NULL};

if (! PyArg_ParseTupleAndKeywords(args, kw, "U:strftime", keywords,
if (! PyArg_ParseTupleAndKeywords(args, kw, "U:strftime", kwlist,
&format))
return NULL;

Expand Down Expand Up @@ -4984,10 +4984,10 @@ datetime_fromtimestamp(PyObject *cls, PyObject *args, PyObject *kw)
PyObject *self;
PyObject *timestamp;
PyObject *tzinfo = Py_None;
static char *keywords[] = {"timestamp", "tz", NULL};
static char *kwlist[] = {"timestamp", "tz", NULL};

if (! PyArg_ParseTupleAndKeywords(args, kw, "O|O:fromtimestamp",
keywords, &timestamp, &tzinfo))
kwlist, &timestamp, &tzinfo))
return NULL;
if (check_tzinfo_subclass(tzinfo) < 0)
return NULL;
Expand Down Expand Up @@ -5041,13 +5041,13 @@ datetime_strptime(PyObject *cls, PyObject *args)
static PyObject *
datetime_combine(PyObject *cls, PyObject *args, PyObject *kw)
{
static char *keywords[] = {"date", "time", "tzinfo", NULL};
static char *kwlist[] = {"date", "time", "tzinfo", NULL};
PyObject *date;
PyObject *time;
PyObject *tzinfo = NULL;
PyObject *result = NULL;

if (PyArg_ParseTupleAndKeywords(args, kw, "O!O!|O:combine", keywords,
if (PyArg_ParseTupleAndKeywords(args, kw, "O!O!|O:combine", kwlist,
&PyDateTime_DateType, &date,
&PyDateTime_TimeType, &time, &tzinfo)) {
if (tzinfo == NULL) {
Expand Down Expand Up @@ -5415,7 +5415,7 @@ datetime_isoformat(PyDateTime_DateTime *self, PyObject *args, PyObject *kw)
{
int sep = 'T';
char *timespec = NULL;
static char *keywords[] = {"sep", "timespec", NULL};
static char *kwlist[] = {"sep", "timespec", NULL};
char buffer[100];
PyObject *result = NULL;
int us = DATE_GET_MICROSECOND(self);
Expand All @@ -5428,7 +5428,7 @@ datetime_isoformat(PyDateTime_DateTime *self, PyObject *args, PyObject *kw)
};
size_t given_spec;

if (!PyArg_ParseTupleAndKeywords(args, kw, "|Cs:isoformat", keywords, &sep, &timespec))
if (!PyArg_ParseTupleAndKeywords(args, kw, "|Cs:isoformat", kwlist, &sep, &timespec))
return NULL;

if (timespec == NULL || strcmp(timespec, "auto") == 0) {
Expand Down Expand Up @@ -5871,9 +5871,9 @@ datetime_astimezone(PyDateTime_DateTime *self, PyObject *args, PyObject *kw)
PyObject *temp;
PyObject *self_tzinfo;
PyObject *tzinfo = Py_None;
static char *keywords[] = {"tz", NULL};
static char *kwlist[] = {"tz", NULL};

if (! PyArg_ParseTupleAndKeywords(args, kw, "|O:astimezone", keywords,
if (! PyArg_ParseTupleAndKeywords(args, kw, "|O:astimezone", kwlist,
&tzinfo))
return NULL;

Expand Down
12 changes: 6 additions & 6 deletions Modules/_functoolsmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,9 +510,9 @@ keyobject_call(keyobject *ko, PyObject *args, PyObject *kwds)
{
PyObject *object;
keyobject *result;
static char *kwargs[] = {"obj", NULL};
static char *kwlist[] = {"obj", NULL};

if (!PyArg_ParseTupleAndKeywords(args, kwds, "O:K", kwargs, &object))
if (!PyArg_ParseTupleAndKeywords(args, kwds, "O:K", kwlist, &object))
return NULL;
result = PyObject_New(keyobject, &keyobject_type);
if (!result)
Expand Down Expand Up @@ -566,10 +566,10 @@ static PyObject *
functools_cmp_to_key(PyObject *self, PyObject *args, PyObject *kwds)
{
PyObject *cmp;
static char *kwargs[] = {"mycmp", NULL};
static char *kwlist[] = {"mycmp", NULL};
keyobject *object;

if (!PyArg_ParseTupleAndKeywords(args, kwds, "O:cmp_to_key", kwargs, &cmp))
if (!PyArg_ParseTupleAndKeywords(args, kwds, "O:cmp_to_key", kwlist, &cmp))
return NULL;
object = PyObject_New(keyobject, &keyobject_type);
if (!object)
Expand Down Expand Up @@ -1096,10 +1096,10 @@ lru_cache_new(PyTypeObject *type, PyObject *args, PyObject *kw)
lru_cache_object *obj;
Py_ssize_t maxsize;
PyObject *(*wrapper)(lru_cache_object *, PyObject *, PyObject *);
static char *keywords[] = {"user_function", "maxsize", "typed",
static char *kwlist[] = {"user_function", "maxsize", "typed",
"cache_info_type", NULL};

if (!PyArg_ParseTupleAndKeywords(args, kw, "OOpO:lru_cache", keywords,
if (!PyArg_ParseTupleAndKeywords(args, kw, "OOpO:lru_cache", kwlist,
&func, &maxsize_O, &typed,
&cache_info_type)) {
return NULL;
Expand Down
18 changes: 9 additions & 9 deletions Modules/_lzmamodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,8 @@ INT_TYPE_CONVERTER_FUNC(lzma_match_finder, lzma_mf_converter)
static void *
parse_filter_spec_lzma(PyObject *spec)
{
static char *optnames[] = {"id", "preset", "dict_size", "lc", "lp",
"pb", "mode", "nice_len", "mf", "depth", NULL};
static char *kwlist[] = {"id", "preset", "dict_size", "lc", "lp",
"pb", "mode", "nice_len", "mf", "depth", NULL};
PyObject *id;
PyObject *preset_obj;
uint32_t preset = LZMA_PRESET_DEFAULT;
Expand Down Expand Up @@ -224,7 +224,7 @@ parse_filter_spec_lzma(PyObject *spec)
}

if (!PyArg_ParseTupleAndKeywords(empty_tuple, spec,
"|OOO&O&O&O&O&O&O&O&", optnames,
"|OOO&O&O&O&O&O&O&O&", kwlist,
&id, &preset_obj,
uint32_converter, &options->dict_size,
uint32_converter, &options->lc,
Expand All @@ -245,12 +245,12 @@ parse_filter_spec_lzma(PyObject *spec)
static void *
parse_filter_spec_delta(PyObject *spec)
{
static char *optnames[] = {"id", "dist", NULL};
static char *kwlist[] = {"id", "dist", NULL};
PyObject *id;
uint32_t dist = 1;
lzma_options_delta *options;

if (!PyArg_ParseTupleAndKeywords(empty_tuple, spec, "|OO&", optnames,
if (!PyArg_ParseTupleAndKeywords(empty_tuple, spec, "|OO&", kwlist,
&id, uint32_converter, &dist)) {
PyErr_SetString(PyExc_ValueError,
"Invalid filter specifier for delta filter");
Expand All @@ -269,12 +269,12 @@ parse_filter_spec_delta(PyObject *spec)
static void *
parse_filter_spec_bcj(PyObject *spec)
{
static char *optnames[] = {"id", "start_offset", NULL};
static char *kwlist[] = {"id", "start_offset", NULL};
PyObject *id;
uint32_t start_offset = 0;
lzma_options_bcj *options;

if (!PyArg_ParseTupleAndKeywords(empty_tuple, spec, "|OO&", optnames,
if (!PyArg_ParseTupleAndKeywords(empty_tuple, spec, "|OO&", kwlist,
&id, uint32_converter, &start_offset)) {
PyErr_SetString(PyExc_ValueError,
"Invalid filter specifier for BCJ filter");
Expand Down Expand Up @@ -704,15 +704,15 @@ For one-shot compression, use the compress() function instead.
static int
Compressor_init(Compressor *self, PyObject *args, PyObject *kwargs)
{
static char *arg_names[] = {"format", "check", "preset", "filters", NULL};
static char *kwlist[] = {"format", "check", "preset", "filters", NULL};
int format = FORMAT_XZ;
int check = -1;
uint32_t preset = LZMA_PRESET_DEFAULT;
PyObject *preset_obj = Py_None;
PyObject *filterspecs = Py_None;

if (!PyArg_ParseTupleAndKeywords(args, kwargs,
"|iiOO:LZMACompressor", arg_names,
"|iiOO:LZMACompressor", kwlist,
&format, &check, &preset_obj,
&filterspecs))
return -1;
Expand Down
4 changes: 2 additions & 2 deletions Modules/_sqlite/connection.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1493,9 +1493,9 @@ pysqlite_connection_backup(pysqlite_Connection *self, PyObject *args, PyObject *
int sleep_ms = 250;
sqlite3 *bck_conn;
sqlite3_backup *bck_handle;
static char *keywords[] = {"target", "pages", "progress", "name", "sleep", NULL};
static char *kwlist[] = {"target", "pages", "progress", "name", "sleep", NULL};

if (!PyArg_ParseTupleAndKeywords(args, kwds, "O!|$iOsO:backup", keywords,
if (!PyArg_ParseTupleAndKeywords(args, kwds, "O!|$iOsO:backup", kwlist,
&pysqlite_ConnectionType, &target,
&pages, &progress, &name, &sleep_obj)) {
return NULL;
Expand Down
16 changes: 8 additions & 8 deletions Modules/_testcapimodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1025,11 +1025,11 @@ getargs_tuple(PyObject *self, PyObject *args)
static PyObject *
getargs_keywords(PyObject *self, PyObject *args, PyObject *kwargs)
{
static char *keywords[] = {"arg1","arg2","arg3","arg4","arg5", NULL};
static char *kwlist[] = {"arg1","arg2","arg3","arg4","arg5", NULL};
static const char fmt[] = "(ii)i|(i(ii))(iii)i";
int int_args[10]={-1, -1, -1, -1, -1, -1, -1, -1, -1, -1};

if (!PyArg_ParseTupleAndKeywords(args, kwargs, fmt, keywords,
if (!PyArg_ParseTupleAndKeywords(args, kwargs, fmt, kwlist,
&int_args[0], &int_args[1], &int_args[2], &int_args[3], &int_args[4],
&int_args[5], &int_args[6], &int_args[7], &int_args[8], &int_args[9]))
return NULL;
Expand All @@ -1042,12 +1042,12 @@ getargs_keywords(PyObject *self, PyObject *args, PyObject *kwargs)
static PyObject *
getargs_keyword_only(PyObject *self, PyObject *args, PyObject *kwargs)
{
static char *keywords[] = {"required", "optional", "keyword_only", NULL};
static char *kwlist[] = {"required", "optional", "keyword_only", NULL};
int required = -1;
int optional = -1;
int keyword_only = -1;

if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i|i$i", keywords,
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i|i$i", kwlist,
&required, &optional, &keyword_only))
return NULL;
return Py_BuildValue("iii", required, optional, keyword_only);
Expand All @@ -1057,12 +1057,12 @@ getargs_keyword_only(PyObject *self, PyObject *args, PyObject *kwargs)
static PyObject *
getargs_positional_only_and_keywords(PyObject *self, PyObject *args, PyObject *kwargs)
{
static char *keywords[] = {"", "", "keyword", NULL};
static char *kwlist[] = {"", "", "keyword", NULL};
int required = -1;
int optional = -1;
int keyword = -1;

if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i|ii", keywords,
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i|ii", kwlist,
&required, &optional, &keyword))
return NULL;
return Py_BuildValue("iii", required, optional, keyword);
Expand Down Expand Up @@ -5104,7 +5104,7 @@ static struct PyMemberDef test_members[] = {
static PyObject *
test_structmembers_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
{
static char *keywords[] = {
static char *kwlist[] = {
"T_BOOL", "T_BYTE", "T_UBYTE", "T_SHORT", "T_USHORT",
"T_INT", "T_UINT", "T_LONG", "T_ULONG", "T_PYSSIZET",
"T_FLOAT", "T_DOUBLE", "T_STRING_INPLACE",
Expand All @@ -5118,7 +5118,7 @@ test_structmembers_new(PyTypeObject *type, PyObject *args, PyObject *kwargs)
if (ob == NULL)
return NULL;
memset(&ob->structmembers, 0, sizeof(all_structmembers));
if (!PyArg_ParseTupleAndKeywords(args, kwargs, fmt, keywords,
if (!PyArg_ParseTupleAndKeywords(args, kwargs, fmt, kwlist,
&ob->structmembers.bool_member,
&ob->structmembers.byte_member,
&ob->structmembers.ubyte_member,
Expand Down
4 changes: 2 additions & 2 deletions Modules/itertoolsmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4245,9 +4245,9 @@ repeat_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
repeatobject *ro;
PyObject *element;
Py_ssize_t cnt = -1, n_kwds = 0;
static char *kwargs[] = {"object", "times", NULL};
static char *kwlist[] = {"object", "times", NULL};

if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|n:repeat", kwargs,
if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|n:repeat", kwlist,
&element, &cnt))
return NULL;

Expand Down
Loading