Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit c0083fc

Browse files
vstinnervstinner
committed
Rename keywords to kwargs in getargs.c
Issue #29029. Patch written by Serhiy Storchaka.
1 parent d526cfe commit c0083fc

1 file changed

Lines changed: 31 additions & 31 deletions

File tree

‎Python/getargs.c‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1545,7 +1545,7 @@ PyArg_ValidateKeywordArguments(PyObject *kwargs)
15451545
#define IS_END_OF_FORMAT(c) (c == '\0' || c == ';' || c == ':')
15461546

15471547
static int
1548-
vgetargskeywords(PyObject *args, PyObject *keywords, const char *format,
1548+
vgetargskeywords(PyObject *args, PyObject *kwargs, const char *format,
15491549
char **kwlist, va_list *p_va, int flags)
15501550
{
15511551
char msgbuf[512];
@@ -1555,7 +1555,7 @@ vgetargskeywords(PyObject *args, PyObject *keywords, const char *format,
15551555
int max = INT_MAX;
15561556
int i, pos, len;
15571557
int skip = 0;
1558-
Py_ssize_t nargs, nkeywords;
1558+
Py_ssize_t nargs, nkwargs;
15591559
PyObject *current_arg;
15601560
freelistentry_t static_entries[STATIC_FREELIST_ENTRIES];
15611561
freelist_t freelist;
@@ -1565,7 +1565,7 @@ vgetargskeywords(PyObject *args, PyObject *keywords, const char *format,
15651565
freelist.entries_malloced = 0;
15661566

15671567
assert(args != NULL && PyTuple_Check(args));
1568-
assert(keywords == NULL || PyDict_Check(keywords));
1568+
assert(kwargs == NULL || PyDict_Check(kwargs));
15691569
assert(format != NULL);
15701570
assert(kwlist != NULL);
15711571
assert(p_va != NULL);
@@ -1604,15 +1604,15 @@ vgetargskeywords(PyObject *args, PyObject *keywords, const char *format,
16041604
}
16051605

16061606
nargs = PyTuple_GET_SIZE(args);
1607-
nkeywords = (keywords == NULL) ? 0 : PyDict_GET_SIZE(keywords);
1608-
if (nargs + nkeywords > len) {
1607+
nkwargs = (kwargs == NULL) ? 0 : PyDict_GET_SIZE(kwargs);
1608+
if (nargs + nkwargs > len) {
16091609
PyErr_Format(PyExc_TypeError,
16101610
"%s%s takes at most %d argument%s (%zd given)",
16111611
(fname == NULL) ? "function" : fname,
16121612
(fname == NULL) ? "" : "()",
16131613
len,
16141614
(len == 1) ? "" : "s",
1615-
nargs + nkeywords);
1615+
nargs + nkwargs);
16161616
return cleanreturn(0, &freelist);
16171617
}
16181618

@@ -1673,14 +1673,14 @@ vgetargskeywords(PyObject *args, PyObject *keywords, const char *format,
16731673
}
16741674
if (!skip) {
16751675
current_arg = NULL;
1676-
if (nkeywords && i >= pos) {
1677-
current_arg = PyDict_GetItemString(keywords, keyword);
1676+
if (nkwargs && i >= pos) {
1677+
current_arg = PyDict_GetItemString(kwargs, keyword);
16781678
if (!current_arg && PyErr_Occurred()) {
16791679
return cleanreturn(0, &freelist);
16801680
}
16811681
}
16821682
if (current_arg) {
1683-
--nkeywords;
1683+
--nkwargs;
16841684
if (i < nargs) {
16851685
/* arg present in tuple and in dict */
16861686
PyErr_Format(PyExc_TypeError,
@@ -1724,7 +1724,7 @@ vgetargskeywords(PyObject *args, PyObject *keywords, const char *format,
17241724
* fulfilled and no keyword args left, with no further
17251725
* validation. XXX Maybe skip this in debug build ?
17261726
*/
1727-
if (!nkeywords && !skip) {
1727+
if (!nkwargs && !skip) {
17281728
return cleanreturn(1, &freelist);
17291729
}
17301730
}
@@ -1756,10 +1756,10 @@ vgetargskeywords(PyObject *args, PyObject *keywords, const char *format,
17561756
}
17571757

17581758
/* make sure there are no extraneous keyword arguments */
1759-
if (nkeywords > 0) {
1759+
if (nkwargs > 0) {
17601760
PyObject *key, *value;
17611761
Py_ssize_t pos = 0;
1762-
while (PyDict_Next(keywords, &pos, &key, &value)) {
1762+
while (PyDict_Next(kwargs, &pos, &key, &value)) {
17631763
int match = 0;
17641764
if (!PyUnicode_Check(key)) {
17651765
PyErr_SetString(PyExc_TypeError,
@@ -1942,7 +1942,7 @@ find_keyword(PyObject *kwnames, PyObject **kwstack, PyObject *key)
19421942

19431943
static int
19441944
vgetargskeywordsfast_impl(PyObject **args, Py_ssize_t nargs,
1945-
PyObject *keywords, PyObject *kwnames,
1945+
PyObject *kwargs, PyObject *kwnames,
19461946
struct _PyArg_Parser *parser,
19471947
va_list *p_va, int flags)
19481948
{
@@ -1953,7 +1953,7 @@ vgetargskeywordsfast_impl(PyObject **args, Py_ssize_t nargs,
19531953
const char *msg;
19541954
PyObject *keyword;
19551955
int i, pos, len;
1956-
Py_ssize_t nkeywords;
1956+
Py_ssize_t nkwargs;
19571957
PyObject *current_arg;
19581958
freelistentry_t static_entries[STATIC_FREELIST_ENTRIES];
19591959
freelist_t freelist;
@@ -1963,9 +1963,9 @@ vgetargskeywordsfast_impl(PyObject **args, Py_ssize_t nargs,
19631963
freelist.first_available = 0;
19641964
freelist.entries_malloced = 0;
19651965

1966-
assert(keywords == NULL || PyDict_Check(keywords));
1967-
assert((keywords != NULL || kwnames != NULL)
1968-
|| (keywords == NULL && kwnames == NULL));
1966+
assert(kwargs == NULL || PyDict_Check(kwargs));
1967+
assert((kwargs != NULL || kwnames != NULL)
1968+
|| (kwargs == NULL && kwnames == NULL));
19691969
assert(p_va != NULL);
19701970

19711971
if (parser == NULL) {
@@ -1995,24 +1995,24 @@ vgetargskeywordsfast_impl(PyObject **args, Py_ssize_t nargs,
19951995
freelist.entries_malloced = 1;
19961996
}
19971997

1998-
if (keywords != NULL) {
1999-
nkeywords = PyDict_GET_SIZE(keywords);
1998+
if (kwargs != NULL) {
1999+
nkwargs = PyDict_GET_SIZE(kwargs);
20002000
}
20012001
else if (kwnames != NULL) {
2002-
nkeywords = PyTuple_GET_SIZE(kwnames);
2002+
nkwargs = PyTuple_GET_SIZE(kwnames);
20032003
kwstack = args + nargs;
20042004
}
20052005
else {
2006-
nkeywords = 0;
2006+
nkwargs = 0;
20072007
}
2008-
if (nargs + nkeywords > len) {
2008+
if (nargs + nkwargs > len) {
20092009
PyErr_Format(PyExc_TypeError,
20102010
"%s%s takes at most %d argument%s (%zd given)",
20112011
(parser->fname == NULL) ? "function" : parser->fname,
20122012
(parser->fname == NULL) ? "" : "()",
20132013
len,
20142014
(len == 1) ? "" : "s",
2015-
nargs + nkeywords);
2015+
nargs + nkwargs);
20162016
return cleanreturn(0, &freelist);
20172017
}
20182018
if (parser->max < nargs) {
@@ -2036,9 +2036,9 @@ vgetargskeywordsfast_impl(PyObject **args, Py_ssize_t nargs,
20362036
assert(!IS_END_OF_FORMAT(*format));
20372037

20382038
current_arg = NULL;
2039-
if (nkeywords && i >= pos) {
2040-
if (keywords != NULL) {
2041-
current_arg = PyDict_GetItem(keywords, keyword);
2039+
if (nkwargs && i >= pos) {
2040+
if (kwargs != NULL) {
2041+
current_arg = PyDict_GetItem(kwargs, keyword);
20422042
if (!current_arg && PyErr_Occurred()) {
20432043
return cleanreturn(0, &freelist);
20442044
}
@@ -2048,7 +2048,7 @@ vgetargskeywordsfast_impl(PyObject **args, Py_ssize_t nargs,
20482048
}
20492049
}
20502050
if (current_arg) {
2051-
--nkeywords;
2051+
--nkwargs;
20522052
if (i < nargs) {
20532053
/* arg present in tuple and in dict */
20542054
PyErr_Format(PyExc_TypeError,
@@ -2092,7 +2092,7 @@ vgetargskeywordsfast_impl(PyObject **args, Py_ssize_t nargs,
20922092
* fulfilled and no keyword args left, with no further
20932093
* validation. XXX Maybe skip this in debug build ?
20942094
*/
2095-
if (!nkeywords) {
2095+
if (!nkwargs) {
20962096
return cleanreturn(1, &freelist);
20972097
}
20982098

@@ -2105,11 +2105,11 @@ vgetargskeywordsfast_impl(PyObject **args, Py_ssize_t nargs,
21052105
assert(IS_END_OF_FORMAT(*format) || (*format == '|') || (*format == '$'));
21062106

21072107
/* make sure there are no extraneous keyword arguments */
2108-
if (nkeywords > 0) {
2109-
if (keywords != NULL) {
2108+
if (nkwargs > 0) {
2109+
if (kwargs != NULL) {
21102110
PyObject *key, *value;
21112111
Py_ssize_t pos = 0;
2112-
while (PyDict_Next(keywords, &pos, &key, &value)) {
2112+
while (PyDict_Next(kwargs, &pos, &key, &value)) {
21132113
int match;
21142114
if (!PyUnicode_Check(key)) {
21152115
PyErr_SetString(PyExc_TypeError,

0 commit comments

Comments
 (0)