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

diff --git a/Objects/object.c b/Objects/object.c
index 30263ba0f1ee8cf58df8a189d9fe7143760e816d..fd31e51c0ec0ce25df7e842dc54d5bcf7407e55c 100644 (file)
--- 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);