(original) (raw)

changeset: 102848:c53c532de995 user: Victor Stinner victor.stinner@gmail.com date: Tue Aug 23 00:04:41 2016 +0200 files: Python/errors.c description: Issue #27809: PyErr_SetImportError() uses fast call diff -r 0c65a2089f00 -r c53c532de995 Python/errors.c --- a/Python/errors.c Mon Aug 22 23:59:08 2016 +0200 +++ b/Python/errors.c Tue Aug 23 00:04:41 2016 +0200 @@ -699,18 +699,14 @@ PyObject * PyErr_SetImportError(PyObject *msg, PyObject *name, PyObject *path) { - PyObject *args, *kwargs, *error; + PyObject *kwargs, *error; - if (msg == NULL) + if (msg == NULL) { return NULL; - - args = PyTuple_New(1); - if (args == NULL) - return NULL; + } kwargs = PyDict_New(); if (kwargs == NULL) { - Py_DECREF(args); return NULL; } @@ -722,22 +718,20 @@ path = Py_None; } - Py_INCREF(msg); - PyTuple_SET_ITEM(args, 0, msg); - - if (PyDict_SetItemString(kwargs, "name", name) < 0) + if (PyDict_SetItemString(kwargs, "name", name) < 0) { goto done; - if (PyDict_SetItemString(kwargs, "path", path) < 0) + } + if (PyDict_SetItemString(kwargs, "path", path) < 0) { goto done; + } - error = PyObject_Call(PyExc_ImportError, args, kwargs); + error = _PyObject_FastCallDict(PyExc_ImportError, &msg, 1, kwargs); if (error != NULL) { PyErr_SetObject((PyObject *)Py_TYPE(error), error); Py_DECREF(error); } done: - Py_DECREF(args); Py_DECREF(kwargs); return NULL; } /victor.stinner@gmail.com