summaryrefslogtreecommitdiffstats
path: root/Objects/dictobject.c
diff options
context:
space:
mode:
authorNick Coghlan <ncoghlan@gmail.com>2008-07-15 14:27:37 (GMT)
committerNick Coghlan <ncoghlan@gmail.com>2008-07-15 14:27:37 (GMT)
commit53663a695ef2bb96ac0252cd4cc4aa40d4f953be (patch)
treee241ef71b353f8b3162179b1eed5a3f4eaae0c5f /Objects/dictobject.c
parent9ace15ca25e1e72e1b943190a5f4efbd7d118de3 (diff)
downloadcpython-53663a695ef2bb96ac0252cd4cc4aa40d4f953be.zip
cpython-53663a695ef2bb96ac0252cd4cc4aa40d4f953be.tar.gz
cpython-53663a695ef2bb96ac0252cd4cc4aa40d4f953be.tar.bz2
Issue 2235: __hash__ is once again inherited by default, but inheritance can be blocked explicitly so that collections.Hashable remains meaningful
Diffstat (limited to 'Objects/dictobject.c')
-rw-r--r--Objects/dictobject.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index 5791165..038f373 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -2240,7 +2240,7 @@ PyTypeObject PyDict_Type = {
0, /* tp_as_number */
&dict_as_sequence, /* tp_as_sequence */
&dict_as_mapping, /* tp_as_mapping */
- 0, /* tp_hash */
+ (hashfunc)PyObject_HashNotImplemented, /* tp_hash */
0, /* tp_call */
0, /* tp_str */
PyObject_GenericGetAttr, /* tp_getattro */