mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-09 10:37:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Hopefully fix 3-way comparisons. This unfortunately adds yet another

Browse source 
hack, and it's even more disgusting than a PyInstance_Check() call.
If the tp_compare slot is the slot used for overrides in Python,
it's always called.

Add some tests that show what should work too.
This commit is contained in:
Guido van Rossum 2001-09-18 20:38:53 +00:00
parent eb94905265
commit ab3b0343b8
4 changed files with 53 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Objects/typeobject.c
View file

@ -2761,17 +2761,18 @@ half_compare(PyObject *self, PyObject *other)
return 2;
}
static int
slot_tp_compare(PyObject *self, PyObject *other)
/* This slot is published for the benefit of try_3way_compare in object.c */
int
_PyObject_SlotCompare(PyObject *self, PyObject *other)
{
int c;
if (self->ob_type->tp_compare == slot_tp_compare) {
if (self->ob_type->tp_compare == _PyObject_SlotCompare) {
c = half_compare(self, other);
if (c <= 1)
return c;
}
if (other->ob_type->tp_compare == slot_tp_compare) {
if (other->ob_type->tp_compare == _PyObject_SlotCompare) {
c = half_compare(other, self);
if (c < -1)
return -2;
@ -3190,7 +3191,7 @@ override_slots(PyTypeObject *type, PyObject *dict)
PyDict_GetItemString(dict, "__repr__"))
type->tp_print = NULL;
TPSLOT("__cmp__", tp_compare, slot_tp_compare);
TPSLOT("__cmp__", tp_compare, _PyObject_SlotCompare);
TPSLOT("__repr__", tp_repr, slot_tp_repr);
TPSLOT("__hash__", tp_hash, slot_tp_hash);
TPSLOT("__call__", tp_call, slot_tp_call);