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

f8d59d28 · Martin v. Löwis · 7883dc8a · f8d59d28
Kaydet (Commit) f8d59d28 authored Eki 24, 2003 tarafından Martin v. Löwis
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

modsupport.c Python/modsupport.c +3 -2

No files found.
--- 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,
+		if (!PyErr_Occurred())
-				"PyModule_AddObject() needs non-NULL value");
+			PyErr_SetString(PyExc_TypeError,
+					"PyModule_AddObject() needs non-NULL value");
 		return -1;
 	}