mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-30 22:54:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

__hash__ may now return long int; the final hash

Browse source 
value is obtained by invoking hash on the long int.
Fixes #1536021.
This commit is contained in:
Martin v. Löwis 2006-08-09 07:57:39 +00:00
parent 209307eb3b
commit ab2f8f7bd5
5 changed files with 24 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Objects/classobject.c
View file

@ -934,11 +934,9 @@ instance_hash(PyInstanceObject *inst)
Py_DECREF(func);
if (res == NULL)
return -1;
if (PyInt_Check(res)) {
outcome = PyInt_AsLong(res);
if (outcome == -1)
outcome = -2;
}
if (PyInt_Check(res) || PyLong_Check(res))
/* This already converts a -1 result to -2. */
outcome = res->ob_type->tp_hash(res);
else {
PyErr_SetString(PyExc_TypeError,
"__hash__() should return an int");