mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-01 07:33:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

(arre, arigo) SF bug #1350060

Browse source 
Give a consistent behavior for comparison and hashing of method objects
(both user- and built-in methods).  Now compares the 'self' recursively.
The hash was already asking for the hash of 'self'.
This commit is contained in:
Armin Rigo 2006-06-08 10:56:24 +00:00
parent 996710fd44
commit fd01d7933b
4 changed files with 81 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Objects/classobject.c
View file

@ -2221,9 +2221,17 @@ instancemethod_dealloc(register PyMethodObject *im)
static int
instancemethod_compare(PyMethodObject *a, PyMethodObject *b)
{
if (a->im_self != b->im_self)
int cmp;
cmp = PyObject_Compare(a->im_func, b->im_func);
if (cmp)
return cmp;
if (a->im_self == b->im_self)
return 0;
if (a->im_self == NULL || b->im_self == NULL)
return (a->im_self < b->im_self) ? -1 : 1;
return PyObject_Compare(a->im_func, b->im_func);
else
return PyObject_Compare(a->im_self, b->im_self);
}
static PyObject *
@ -2299,7 +2307,10 @@ instancemethod_hash(PyMethodObject *a)
y = PyObject_Hash(a->im_func);
if (y == -1)
return -1;
return x ^ y;
x = x ^ y;
if (x == -1)
x = -2;
return x;
}
static int