From: Tim Peters <tim.peters@gmail.com>
Date: Sun, 16 Sep 2001 20:33:22 +0000 (+0000)
Subject: merge_class_dict():  Clear the error if __bases__ doesn't exist.
X-Git-Tag: v2.2.1c1~1783
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bc7e863ce2aa9d3b9e5077865647f5db0ee050de;p=python

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

diff --git a/Objects/object.c b/Objects/object.c
index 30263ba0f1..fd31e51c0e 100644
--- 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);