traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vgetargskeywords: The keywords arg is a dict (if non-NULL), so use the 

dict API everywhere on it instead of sometimes using the slower mapping
API.
This commit is contained in:
Tim Peters 2001-10-27 05:50:39 +00:00
parent 61dde63e3b
commit 077f574db1
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Python/getargs.c
View File

@ -1090,7 +1090,7 @@ vgetargskeywords(PyObject *args, PyObject *keywords, char *format,
char *thiskw = kwlist[i];
if (thiskw == NULL)
break;
if (PyMapping_HasKeyString(keywords, thiskw)) {
if (PyDict_GetItemString(keywords, thiskw)) {
PyErr_Format(PyExc_TypeError,
"keyword parameter '%s' was given "
"by position and by name",
@ -1105,9 +1105,8 @@ vgetargskeywords(PyObject *args, PyObject *keywords, char *format,
len = nargs;
if (keywords && nargs < min) {
for (i = nargs; i < min; i++) {
if (PyMapping_HasKeyString(keywords, kwlist[i])) {
if (PyDict_GetItemString(keywords, kwlist[i]))
len++;
}
}
}
PyErr_Clear();
@ -1168,15 +1167,16 @@ vgetargskeywords(PyObject *args, PyObject *keywords, char *format,
PyObject *item;
if (*format == '|')
format++;
item = PyMapping_GetItemString(keywords, kwlist[i]);
item = PyDict_GetItemString(keywords, kwlist[i]);
if (item != NULL) {
Py_INCREF(item);
msg = convertitem(item, &format, p_va, levels, msgbuf);
Py_DECREF(item);
if (msg) {
seterror(i+1, msg, levels, fname, message);
return 0;
}
converted++;
Py_DECREF(item);
}
else {
PyErr_Clear();