Revert change f860b7a775c5
Revert change "Issue #27213: Reintroduce checks in _PyStack_AsDict()", pushed by mistake.
This commit is contained in:
parent
2f462a68f9
commit
b8d768b019
|
@ -275,9 +275,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx*/
|
|||
|
||||
PyAPI_FUNC(PyObject *) _PyStack_AsDict(
|
||||
PyObject **values,
|
||||
Py_ssize_t nkwargs,
|
||||
PyObject *kwnames,
|
||||
PyObject *func);
|
||||
PyObject *kwnames);
|
||||
|
||||
/* Convert (args, nargs, kwargs) into a (stack, nargs, kwnames).
|
||||
|
||||
|
|
|
@ -2367,9 +2367,9 @@ _PyObject_Call_Prepend(PyObject *func,
|
|||
}
|
||||
|
||||
PyObject *
|
||||
_PyStack_AsDict(PyObject **values, Py_ssize_t nkwargs, PyObject *kwnames,
|
||||
PyObject *func)
|
||||
_PyStack_AsDict(PyObject **values, PyObject *kwnames)
|
||||
{
|
||||
Py_ssize_t nkwargs = PyTuple_GET_SIZE(kwnames);
|
||||
PyObject *kwdict;
|
||||
Py_ssize_t i;
|
||||
|
||||
|
@ -2378,24 +2378,12 @@ _PyStack_AsDict(PyObject **values, Py_ssize_t nkwargs, PyObject *kwnames,
|
|||
return NULL;
|
||||
}
|
||||
|
||||
for (i=0; i < nkwargs; i++) {
|
||||
int err;
|
||||
for (i = 0; i < nkwargs; i++) {
|
||||
PyObject *key = PyTuple_GET_ITEM(kwnames, i);
|
||||
PyObject *value = *values++;
|
||||
|
||||
if (PyDict_GetItem(kwdict, key) != NULL) {
|
||||
PyErr_Format(PyExc_TypeError,
|
||||
"%.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) {
|
||||
assert(PyUnicode_CheckExact(key));
|
||||
assert(PyDict_GetItem(kwdict, key) == NULL);
|
||||
if (PyDict_SetItem(kwdict, key, value)) {
|
||||
Py_DECREF(kwdict);
|
||||
return NULL;
|
||||
}
|
||||
|
@ -2479,7 +2467,7 @@ _PyObject_FastCallKeywords(PyObject *func, PyObject **stack, Py_ssize_t nargs,
|
|||
}
|
||||
|
||||
if (nkwargs > 0) {
|
||||
kwdict = _PyStack_AsDict(stack + nargs, nkwargs, kwnames, func);
|
||||
kwdict = _PyStack_AsDict(stack + nargs, kwnames);
|
||||
if (kwdict == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
|
|
|
@ -279,7 +279,7 @@ _PyCFunction_FastCallKeywords(PyObject *func, PyObject **stack,
|
|||
|
||||
nkwargs = (kwnames == NULL) ? 0 : PyTuple_GET_SIZE(kwnames);
|
||||
if (nkwargs > 0) {
|
||||
kwdict = _PyStack_AsDict(stack + nargs, nkwargs, kwnames, func);
|
||||
kwdict = _PyStack_AsDict(stack + nargs, kwnames);
|
||||
if (kwdict == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue