summaryrefslogtreecommitdiffstats
path: root/Python/errors.c
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2012-04-18 14:48:00 (GMT)
committerBenjamin Peterson <benjamin@python.org>2012-04-18 14:48:00 (GMT)
commitda20cd2b6bf40d712f6296b9e21ff099b22aab71 (patch)
treef0aa35e37bf63740a2fa004c3d8ddb62f9d231e1 /Python/errors.c
parent94c001b50377267626e136949ba410c8ad28a6f0 (diff)
downloadcpython-da20cd2b6bf40d712f6296b9e21ff099b22aab71.zip
cpython-da20cd2b6bf40d712f6296b9e21ff099b22aab71.tar.gz
cpython-da20cd2b6bf40d712f6296b9e21ff099b22aab71.tar.bz2
fix refcnt/style/debuging oversights
Diffstat (limited to 'Python/errors.c')
-rw-r--r--Python/errors.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/Python/errors.c b/Python/errors.c
index 63eebe2..558404a 100644
--- a/Python/errors.c
+++ b/Python/errors.c
@@ -593,13 +593,15 @@ PyErr_SetImportError(PyObject *msg, PyObject *name, PyObject *path)
if (msg == NULL)
return NULL;
- args = PyTuple_New(1);
+ args = PyTuple_New(0);
if (args == NULL)
return NULL;
kwargs = PyDict_New();
- if (kwargs == NULL)
+ if (kwargs == NULL) {
+ Py_DECREF(args);
return NULL;
+ }
if (name == NULL) {
Py_INCREF(Py_None);
@@ -612,13 +614,13 @@ PyErr_SetImportError(PyObject *msg, PyObject *name, PyObject *path)
}
Py_INCREF(msg);
- PyTuple_SetItem(args, 0, NULL);//msg);
+ PyTuple_SET_ITEM(args, 0, msg);
PyDict_SetItemString(kwargs, "name", name);
PyDict_SetItemString(kwargs, "path", path);
error = PyObject_Call(PyExc_ImportError, args, kwargs);
- if (error!= NULL) {
- PyErr_SetObject((PyObject *) Py_TYPE(error), error);
+ if (error != NULL) {
+ PyErr_SetObject((PyObject *)Py_TYPE(error), error);
Py_DECREF(error);
}