traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix email post-commit review comments. 

Add INCREFs, fix args->kwargs, and a second args==NULL check was removed,
left over from a merger with another function. Instead, checking msg==NULL
does what that used to do in a roundabout way.
This commit is contained in:
Brian Curtin 2012-04-18 08:30:51 -05:00
parent 03c7ed1580
commit 94c001b503
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Python/errors.c
View File

@ -590,29 +590,32 @@ PyErr_SetImportError(PyObject *msg, PyObject *name, PyObject *path)
{
PyObject *args, *kwargs, *error;
if (msg == NULL)
return NULL;
args = PyTuple_New(1);
if (args == NULL)
return NULL;
kwargs = PyDict_New();
if (args == NULL)
if (kwargs == NULL)
return NULL;
if (name == NULL)
if (name == NULL) {
Py_INCREF(Py_None);
name = Py_None;
}
if (path == NULL)
if (path == NULL) {
Py_INCREF(Py_None);
path = Py_None;
}
Py_INCREF(msg);
PyTuple_SetItem(args, 0, msg);
PyTuple_SetItem(args, 0, NULL);//msg);
PyDict_SetItemString(kwargs, "name", name);
PyDict_SetItemString(kwargs, "path", path);
/* args must at least be an empty tuple */
if (args == NULL)
args = PyTuple_New(0);
error = PyObject_Call(PyExc_ImportError, args, kwargs);
if (error!= NULL) {
PyErr_SetObject((PyObject *) Py_TYPE(error), error);