mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-22 16:33:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

vgetargskeywords:

Browse source 
+ Renamed argslen to nargs.
+ Renamed kwlen to nkeywords.  This one was especially confusing because
  kwlen wasn't the length of the kwlist argument, but of the keywords
  argument.
This commit is contained in:
Tim Peters 2001-10-27 04:38:11 +00:00
parent 28bf7a9770
commit 6fb2635f25
1 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Python/getargs.c
View file

@ -1031,8 +1031,8 @@ vgetargskeywords(PyObject *args, PyObject *keywords, char *format,
int levels[32]; int levels[32];
char *fname, *message; char *fname, *message;
int min, max; int min, max;
char *formatsave = format; char *formatsave;
int i, len, argslen, kwlen; int i, len, nargs, nkeywords;
char *msg, *ks, **p; char *msg, *ks, **p;
int nkwds, pos, match, converted; int nkwds, pos, match, converted;
PyObject *key, *value; PyObject *key, *value;
@ -1051,6 +1051,7 @@ vgetargskeywords(PyObject *args, PyObject *keywords, char *format,
Raise error if a tuple arg spec is found. Raise error if a tuple arg spec is found.
*/ */
fname = message = NULL; fname = message = NULL;
formatsave = format;
min = -1; min = -1;
max = 0; max = 0;
while ((i = *format++) != '\0') { while ((i = *format++) != '\0') {
@ -1078,11 +1079,11 @@ vgetargskeywords(PyObject *args, PyObject *keywords, char *format,
} }
format = formatsave; format = formatsave;
argslen = PyTuple_GET_SIZE(args); nargs = PyTuple_GET_SIZE(args);
/* do a cursory check of the keywords just to see how many we got */ /* do a cursory check of the keywords just to see how many we got */
kwlen = 0; nkeywords = 0;
if (keywords) { if (keywords) {
if (!PyDict_Check(keywords)) { if (!PyDict_Check(keywords)) {
PyErr_Format(PyExc_SystemError, PyErr_Format(PyExc_SystemError,
@ -1090,7 +1091,7 @@ vgetargskeywords(PyObject *args, PyObject *keywords, char *format,
keywords->ob_type->tp_name); keywords->ob_type->tp_name);
return 0; return 0;
} }
kwlen = PyDict_Size(keywords); nkeywords = PyDict_Size(keywords);
} }
/* make sure there are no duplicate values for an argument; /* make sure there are no duplicate values for an argument;
@ -1098,7 +1099,7 @@ vgetargskeywords(PyObject *args, PyObject *keywords, char *format,
keyword parameter in messages */ keyword parameter in messages */
if (keywords) { if (keywords) {
for (i = 0; i < argslen; i++) { for (i = 0; i < nargs; i++) {
char *thiskw = kwlist[i]; char *thiskw = kwlist[i];
if (thiskw == NULL) if (thiskw == NULL)
break; break;
@ -1123,9 +1124,9 @@ vgetargskeywords(PyObject *args, PyObject *keywords, char *format,
/* required arguments missing from args can be supplied by keyword /* required arguments missing from args can be supplied by keyword
arguments */ arguments */
len = argslen; len = nargs;
if (keywords && argslen < min) { if (keywords && nargs < min) {
for (i = argslen; i < min; i++) { for (i = nargs; i < min; i++) {
if (PyMapping_HasKeyString(keywords, kwlist[i])) { if (PyMapping_HasKeyString(keywords, kwlist[i])) {
len++; len++;
} }
@ -1155,7 +1156,7 @@ vgetargskeywords(PyObject *args, PyObject *keywords, char *format,
return 0; return 0;
} }
for (i = 0; i < argslen; i++) { for (i = 0; i < nargs; i++) {
if (*format == '|') if (*format == '|')
format++; format++;
msg = convertitem(PyTuple_GET_ITEM(args, i), &format, p_va, msg = convertitem(PyTuple_GET_ITEM(args, i), &format, p_va,
@ -1191,7 +1192,7 @@ vgetargskeywords(PyObject *args, PyObject *keywords, char *format,
string where it was left after processing args */ string where it was left after processing args */
converted = 0; converted = 0;
for (i = argslen; i < nkwds; i++) { for (i = nargs; i < nkwds; i++) {
PyObject *item; PyObject *item;
if (*format == '|') if (*format == '|')
format++; format++;
@ -1218,7 +1219,7 @@ vgetargskeywords(PyObject *args, PyObject *keywords, char *format,
/* make sure there are no extraneous keyword arguments */ /* make sure there are no extraneous keyword arguments */
pos = 0; pos = 0;
if (converted < kwlen) { if (converted < nkeywords) {
while (PyDict_Next(keywords, &pos, &key, &value)) { while (PyDict_Next(keywords, &pos, &key, &value)) {
match = 0; match = 0;
ks = PyString_AsString(key); ks = PyString_AsString(key);