From: Martin v. Löwis <martin@v.loewis.de>
Date: Fri, 24 Oct 2003 20:05:32 +0000 (+0000)
Subject: Patch #828384: Don't discard nested exception in AddObject.
X-Git-Tag: v2.4a1~1377
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f8d59d28e0867c82b647d94c0aecd9e1c3accd9e;p=python

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

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;
 	}