[pypy-svn] r73754 - pypy/branch/cpython-extension/pypy/module/cpyext

[afa at codespeak.net]

Author: afa
Date: Thu Apr 15 01:29:11 2010
New Revision: 73754

Modified:
   pypy/branch/cpython-extension/pypy/module/cpyext/typeobject.py
Log:
This 'if' does not seem necessary


Modified: pypy/branch/cpython-extension/pypy/module/cpyext/typeobject.py
==============================================================================
--- pypy/branch/cpython-extension/pypy/module/cpyext/typeobject.py	(original)
+++ pypy/branch/cpython-extension/pypy/module/cpyext/typeobject.py	Thu Apr 15 01:29:11 2010
@@ -414,12 +414,11 @@
     assert len(bases_w) <= 1
     pto.c_tp_base = lltype.nullptr(PyTypeObject)
     pto.c_tp_bases = lltype.nullptr(PyObject.TO)
-    if not space.is_w(w_type, space.w_type) and not \
-            space.is_w(w_type, space.w_object):
-        if bases_w:
-            ref = make_ref(space, bases_w[0])
-            pto.c_tp_base = rffi.cast(PyTypeObjectPtr, ref)
-        PyPyType_Ready(space, pto, w_type)
+
+    if bases_w:
+        ref = make_ref(space, bases_w[0])
+        pto.c_tp_base = rffi.cast(PyTypeObjectPtr, ref)
+    PyPyType_Ready(space, pto, w_type)
 
     if pto.c_tp_base:
         pto.c_tp_basicsize = pto.c_tp_base.c_tp_basicsize