mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 17:08:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Update to MvL's patch #424475 to avoid returning 2 when tp_compare

Browse source 
returns that.  (This fix is also by MvL; checkin it in because I want
to make more changes here.  I'm still not 100% satisfied -- see
comments attached to the patch.)
This commit is contained in:
Guido van Rossum 2001-08-16 08:02:45 +00:00
parent 49b253b173
commit 82fc51c19c
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Objects/object.c
View file

@ -580,8 +580,11 @@ do_cmp(PyObject *v, PyObject *w)
cmpfunc f;
if (v->ob_type == w->ob_type
&& (f = v->ob_type->tp_compare) != NULL)
return (*f)(v, w);
&& (f = v->ob_type->tp_compare) != NULL) {
c = (*f)(v, w);
if (c != 2 || !PyInstance_Check(v))
return c;
}
c = try_rich_to_3way_compare(v, w);
if (c < 2)
return c;