diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2003-10-24 20:05:32 +0000 |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2003-10-24 20:05:32 +0000 |
| commit | 04b1789e789c1f5e273949db2e7a873575ebd8c0 (patch) | |
| tree | 5965d57698b369f463d94ba38557f8e332ea055e /Python/modsupport.c | |
| parent | 9642421e5bb70104f04e5ed278e9bbfc90ddf434 (diff) | |
| download | cpython-04b1789e789c1f5e273949db2e7a873575ebd8c0.tar.gz | |
Patch #828384: Don't discard nested exception in AddObject.
Diffstat (limited to 'Python/modsupport.c')
| -rw-r--r-- | Python/modsupport.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Python/modsupport.c b/Python/modsupport.c index b4640b064a..ec85511ebd 100644 --- a/Python/modsupport.c +++ b/Python/modsupport.c @@ -520,8 +520,9 @@ PyModule_AddObject(PyObject *m, char *name, PyObject *o) return -1; } if (!o) { - PyErr_SetString(PyExc_TypeError, - "PyModule_AddObject() needs non-NULL value"); + if (!PyErr_Occurred()) + PyErr_SetString(PyExc_TypeError, + "PyModule_AddObject() needs non-NULL value"); return -1; } |