Merged revisions 69192 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r69192 | mark.dickinson | 2009-02-01 20:36:08 +0000 (Sun, 01 Feb 2009) | 2 lines

  Remove exception for non-NULL tp_compare that was introduced in r69188.
........

diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 379276ed7dfc978f5d66892e92b74b479555f6a4..5b31cbb04442cf47fea57f3f8b948674b3efc72f 100644 (file)
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -3886,13 +3886,6 @@ PyType_Ready(PyTypeObject *type)
                        goto error;
        }
 
-       /* Check reserved slots */
-       if (type->tp_compare) {
-               PyErr_Format(PyExc_TypeError,
-                            "type %s has tp_compare",
-                            type->tp_name);
-       }
-
        /* All done -- set the ready flag */
        assert(type->tp_dict != NULL);
        type->tp_flags =