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

loewis · loewis · commit f8d59d28e086 · 2003-10-24T20:05:32.000Z
diff --git 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;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -520,8 +520,9 @@ PyModule_AddObject(PyObject m, char name, PyObject *o)`
`520`	`520`	`return -1;`
`521`	`521`	`}`
`522`	`522`	`if (!o) {`
`523`		`- PyErr_SetString(PyExc_TypeError,`
`524`		`- "PyModule_AddObject() needs non-NULL value");`
	`523`	`+ if (!PyErr_Occurred())`
	`524`	`+ PyErr_SetString(PyExc_TypeError,`
	`525`	`+ "PyModule_AddObject() needs non-NULL value");`
`525`	`526`	`return -1;`
`526`	`527`	`}`
`527`	`528`