diff options
author | Victor Stinner <victor.stinner@gmail.com> | 2016-09-12 11:30:02 (GMT) |
---|---|---|
committer | Victor Stinner <victor.stinner@gmail.com> | 2016-09-12 11:30:02 (GMT) |
commit | b8d768b0199c55d408f5c8b86d14555aa7be9f98 (patch) | |
tree | d750281fae41ed4dfb784f2c142949d6c65380d1 | |
parent | 2f462a68f9f3feccf4c4b13bd8743501fc0fd77e (diff) | |
download | cpython-b8d768b0199c55d408f5c8b86d14555aa7be9f98.zip cpython-b8d768b0199c55d408f5c8b86d14555aa7be9f98.tar.gz cpython-b8d768b0199c55d408f5c8b86d14555aa7be9f98.tar.bz2 |
Revert change f860b7a775c5
Revert change "Issue #27213: Reintroduce checks in _PyStack_AsDict()", pushed
by mistake.
-rw-r--r-- | Include/abstract.h | 4 | ||||
-rw-r--r-- | Objects/abstract.c | 26 | ||||
-rw-r--r-- | Objects/methodobject.c | 2 |
3 files changed, 9 insertions, 23 deletions
diff --git a/Include/abstract.h b/Include/abstract.h index 8748367..a94ce66 100644 --- a/Include/abstract.h +++ b/Include/abstract.h @@ -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). diff --git a/Objects/abstract.c b/Objects/abstract.c index f9e5009..a929be9 100644 --- a/Objects/abstract.c +++ b/Objects/abstract.c @@ -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; } diff --git a/Objects/methodobject.c b/Objects/methodobject.c index 487ccd7..90c473e 100644 --- a/Objects/methodobject.c +++ b/Objects/methodobject.c @@ -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; } |