[Python-checkins] r69186 - in python/branches/py3k-issue1717: Objects/abstract.c Objects/typeobject.c
mark.dickinson
python-checkins at python.org
Sun Feb 1 13:42:37 CET 2009
Author: mark.dickinson
Date: Sun Feb 1 13:42:37 2009
New Revision: 69186
Log:
Merged revisions 69184 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r69184 | mark.dickinson | 2009-02-01 12:13:56 +0000 (Sun, 01 Feb 2009) | 3 lines
Issue #1717: remove the cmp builtin function, the C-API functions
PyObject_Cmp, PyObject_Compare, and various support functions.
........
Modified:
python/branches/py3k-issue1717/ (props changed)
python/branches/py3k-issue1717/Objects/abstract.c
python/branches/py3k-issue1717/Objects/typeobject.c
Modified: python/branches/py3k-issue1717/Objects/abstract.c
==============================================================================
--- python/branches/py3k-issue1717/Objects/abstract.c (original)
+++ python/branches/py3k-issue1717/Objects/abstract.c Sun Feb 1 13:42:37 2009
@@ -25,6 +25,8 @@
return NULL;
}
+/* Operations on any object */
+
PyObject *
PyObject_Type(PyObject *o)
{
Modified: python/branches/py3k-issue1717/Objects/typeobject.c
==============================================================================
--- python/branches/py3k-issue1717/Objects/typeobject.c (original)
+++ python/branches/py3k-issue1717/Objects/typeobject.c Sun Feb 1 13:42:37 2009
@@ -2897,7 +2897,7 @@
slots_a = ((PyHeapTypeObject *)a)->ht_slots;
slots_b = ((PyHeapTypeObject *)b)->ht_slots;
if (slots_a && slots_b) {
- if (PyObject_RichCompareBool(slots_a, slots_b, Py_NE) == 1)
+ if (PyObject_RichCompareBool(slots_a, slots_b, Py_EQ) != 1)
return 0;
size += sizeof(PyObject *) * PyTuple_GET_SIZE(slots_a);
}
More information about the Python-checkins
mailing list