| commit | f8d59d28e0867c82b647d94c0aecd9e1c3accd9e | [log] [tgz] |
|---|---|---|
| author | Martin v. Löwis <martin@v.loewis.de> | Fri Oct 24 20:05:32 2003 +0000 |
| committer | Martin v. Löwis <martin@v.loewis.de> | Fri Oct 24 20:05:32 2003 +0000 |
| tree | b08d6446556517aa822914216f2f3691c3dffaab | |
| parent | 7883dc8abb81026fb111b2fde09ba602ccf04226 [diff] [blame] |
Patch #828384: Don't discard nested exception in AddObject.
diff --git a/Python/modsupport.c b/Python/modsupport.c index b4640b0..ec85511 100644 --- a/Python/modsupport.c +++ b/Python/modsupport.c
@@ -520,8 +520,9 @@ 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; }