[Python-checkins] cpython (3.2): remove extraneous condition

[benjamin.peterson]

http://hg.python.org/cpython/rev/c1fff85711a6
changeset:   76058:c1fff85711a6
branch:      3.2
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Apr 01 18:48:40 2012 -0400
summary:
  remove extraneous condition

files:
  Objects/typeobject.c |  10 ++++------
  1 files changed, 4 insertions(+), 6 deletions(-)


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

-- 
Repository URL: http://hg.python.org/cpython