mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-07 07:31:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Revert change f860b7a775c5

Browse source 
Revert change "Issue #27213: Reintroduce checks in _PyStack_AsDict()", pushed
by mistake.
This commit is contained in:
Victor Stinner 2016-09-12 13:30:02 +02:00
parent 2f462a68f9
commit b8d768b019
3 changed files with 9 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Include/abstract.h
View file

@ -275,9 +275,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx*/
PyAPI_FUNC(PyObject *) _PyStack_AsDict( PyAPI_FUNC(PyObject *) _PyStack_AsDict(
PyObject **values, PyObject **values,
Py_ssize_t nkwargs, PyObject *kwnames);
PyObject *kwnames,
PyObject *func);
/* Convert (args, nargs, kwargs) into a (stack, nargs, kwnames). /* Convert (args, nargs, kwargs) into a (stack, nargs, kwnames).

26
Objects/abstract.c
View file

@ -2367,9 +2367,9 @@ _PyObject_Call_Prepend(PyObject *func,
} }
PyObject * PyObject *
_PyStack_AsDict(PyObject **values, Py_ssize_t nkwargs, PyObject *kwnames, _PyStack_AsDict(PyObject **values, PyObject *kwnames)
PyObject *func)
{ {
Py_ssize_t nkwargs = PyTuple_GET_SIZE(kwnames);
PyObject *kwdict; PyObject *kwdict;
Py_ssize_t i; Py_ssize_t i;
@ -2378,24 +2378,12 @@ _PyStack_AsDict(PyObject **values, Py_ssize_t nkwargs, PyObject *kwnames,
return NULL; return NULL;
} }
for (i=0; i < nkwargs; i++) { for (i = 0; i < nkwargs; i++) {
int err;
PyObject *key = PyTuple_GET_ITEM(kwnames, i); PyObject *key = PyTuple_GET_ITEM(kwnames, i);
PyObject *value = *values++; PyObject *value = *values++;
assert(PyUnicode_CheckExact(key));
if (PyDict_GetItem(kwdict, key) != NULL) { assert(PyDict_GetItem(kwdict, key) == NULL);
PyErr_Format(PyExc_TypeError, if (PyDict_SetItem(kwdict, key, value)) {
"%.200s%s got multiple values "
"for keyword argument '%U'",
PyEval_GetFuncName(func),
PyEval_GetFuncDesc(func),
key);
Py_DECREF(kwdict);
return NULL;
}
err = PyDict_SetItem(kwdict, key, value);
if (err) {
Py_DECREF(kwdict); Py_DECREF(kwdict);
return NULL; return NULL;
} }
@ -2479,7 +2467,7 @@ _PyObject_FastCallKeywords(PyObject *func, PyObject **stack, Py_ssize_t nargs,
} }
if (nkwargs > 0) { if (nkwargs > 0) {
kwdict = _PyStack_AsDict(stack + nargs, nkwargs, kwnames, func); kwdict = _PyStack_AsDict(stack + nargs, kwnames);
if (kwdict == NULL) { if (kwdict == NULL) {
return NULL; return NULL;
} }

2
Objects/methodobject.c
View file

@ -279,7 +279,7 @@ _PyCFunction_FastCallKeywords(PyObject *func, PyObject **stack,
nkwargs = (kwnames == NULL) ? 0 : PyTuple_GET_SIZE(kwnames); nkwargs = (kwnames == NULL) ? 0 : PyTuple_GET_SIZE(kwnames);
if (nkwargs > 0) { if (nkwargs > 0) {
kwdict = _PyStack_AsDict(stack + nargs, nkwargs, kwnames, func); kwdict = _PyStack_AsDict(stack + nargs, kwnames);
if (kwdict == NULL) { if (kwdict == NULL) {
return NULL; return NULL;
} }