[Python-checkins] r76853 - in python/branches/release26-maint: Objects/typeobject.c

[benjamin.peterson]

Author: benjamin.peterson
Date: Wed Dec 16 04:45:28 2009
New Revision: 76853

Log:
Merged revisions 76852 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r76852 | benjamin.peterson | 2009-12-15 21:36:22 -0600 (Tue, 15 Dec 2009) | 1 line
  
  remove type_compare, since type_richcompare does the same trick
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Objects/typeobject.c

Modified: python/branches/release26-maint/Objects/typeobject.c
==============================================================================
--- python/branches/release26-maint/Objects/typeobject.c	(original)
+++ python/branches/release26-maint/Objects/typeobject.c	Wed Dec 16 04:45:28 2009
@@ -627,15 +627,6 @@
 	{0}
 };
 
-static int
-type_compare(PyObject *v, PyObject *w)
-{
-	/* This is called with type objects only. So we
-	   can just compare the addresses. */
-	Py_uintptr_t vv = (Py_uintptr_t)v;
-	Py_uintptr_t ww = (Py_uintptr_t)w;
-	return (vv < ww) ? -1 : (vv > ww) ? 1 : 0;
-}
 
 static PyObject*
 type_richcompare(PyObject *v, PyObject *w, int op)
@@ -2747,7 +2738,7 @@
 	0,					/* tp_print */
 	0,					/* tp_getattr */
 	0,					/* tp_setattr */
-	type_compare,				/* tp_compare */
+	0,				/* tp_compare */
 	(reprfunc)type_repr,			/* tp_repr */
 	0,					/* tp_as_number */
 	0,					/* tp_as_sequence */