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

tim-one · tim-one · commit bc7e863ce2aa · 2001-09-16T20:33:22.000Z
diff --git 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);
