Patch #828384: Don't discard nested exception in AddObject.

diff --git a/Python/modsupport.c b/Python/modsupport.c
index b4640b064a3f416544e383a668f94312ebcb3841..ec85511ebdf87326267aae81dad549e32bf7a62b 100644 (file)
--- 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;
        }