cpython: c53c532de995 (original) (raw)

Mercurial > cpython

changeset 102848:c53c532de995

Issue #27809: PyErr_SetImportError() uses fast call [#27809]

Victor Stinner victor.stinner@gmail.com
date	Tue, 23 Aug 2016 00:04:41 +0200
parents	0c65a2089f00
children	614dd914c21e
files	Python/errors.c
diffstat	1 files changed, 8 insertions(+), 14 deletions(-)[+] [-] Python/errors.c 22

line wrap: on

line diff

--- a/Python/errors.c +++ b/Python/errors.c @@ -699,18 +699,14 @@ PyObject *PyErr_SetFromWindowsErrWithUni 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;[](#l1.16)
```

}

kwargs = PyDict_New(); if (kwargs == NULL) {

```
   Py_DECREF(args);[](#l1.21)
   return NULL;[](#l1.22)
```
} @@ -722,22 +718,20 @@ PyErr_SetImportError(PyObject *msg, PyOb 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; }