mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-13 10:23:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Manual forward port of 64962 - use PyObject_HashNotImplemented as a tp_hash level indicator that the default hash implementation has not been inherited

Browse source
This commit is contained in:
Nick Coghlan 2008-07-15 15:46:38 +00:00
parent e65282114e
commit d1abd25ed8
12 changed files with 122 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Objects/object.c
View file

@ -781,17 +781,22 @@ finally:
#endif
}
long
PyObject_HashNotImplemented(PyObject *v)
{
PyErr_Format(PyExc_TypeError, "unhashable type: '%.200s'",
Py_TYPE(v)->tp_name);
return -1;
}
long
PyObject_Hash(PyObject *v)
{
PyTypeObject *tp = v->ob_type;
PyTypeObject *tp = Py_TYPE(v);
if (tp->tp_hash != NULL)
return (*tp->tp_hash)(v);
/* Otherwise, the object can't be hashed */
PyErr_Format(PyExc_TypeError, "unhashable type: '%.200s'",
v->ob_type->tp_name);
return -1;
return PyObject_HashNotImplemented(v);
}
PyObject *