remove extraneous condition

3471bb67 · Benjamin Peterson · 29f84381 · 3471bb67
Commit 3471bb67 authored Apr 01, 2012 by Benjamin Peterson
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 6 deletions

Objects/typeobject.c Objects/typeobject.c +4 -6

No files found.
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -464,12 +464,10 @@ type_set_bases(PyTypeObject *type, PyObject *value, void *context)
                            type->tp_name, Py_TYPE(ob)->tp_name);
                    return -1;
        }
-        if (PyType_Check(ob)) {
+        if (PyType_IsSubtype((PyTypeObject*)ob, type)) {
-            if (PyType_IsSubtype((PyTypeObject*)ob, type)) {
+            PyErr_SetString(PyExc_TypeError,
-                PyErr_SetString(PyExc_TypeError,
+                            "a __bases__ item causes an inheritance cycle");
-            "a __bases__ item causes an inheritance cycle");
+            return -1;
-                return -1;
-            }
        }
    }