merge_class_dict(): Clear the error if __bases__ doesn't exist.

merge_class_dict(): Clear the error if bases doesn't exist.
bc7e863c · Tim Peters · 28bc59f1 · bc7e863c
Commit bc7e863c authored Sep 16, 2001 by Tim Peters
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

Objects/object.c Objects/object.c +3 -1

No files found.
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -1399,7 +1399,9 @@ merge_class_dict(PyObject* dict, PyObject* aclass)

 	/* Recursively merge in the base types' (if any) dicts. */
 	bases = PyObject_GetAttrString(aclass, "__bases__");
-	if (bases != NULL) {
+	if (bases == NULL)
+		PyErr_Clear();
+	else {
 		int i, n;
 		assert(PyTuple_Check(bases));
 		n = PyTuple_GET_SIZE(bases);