Rich comparisons fallout: PyObject_Hash() should check for both

gvanrossum · gvanrossum · commit 41c3244875db · 2001-01-18T23:33:37.000Z
tp_compare and tp_richcompare NULL before deciding to do a quickie
based on the object address.  (Tim Peters discovered this.)
diff --git a/Objects/object.c b/Objects/object.c
@@ -914,7 +914,7 @@ PyObject_Hash(PyObject *v)
 	PyTypeObject *tp = v->ob_type;
 	if (tp->tp_hash != NULL)
 		return (*tp->tp_hash)(v);
-	if (tp->tp_compare == NULL) {
+	if (tp->tp_compare == NULL && tp->tp_richcompare == NULL) {
 		return _Py_HashPointer(v); /* Use address as hash value */
 	}
 	/* If there's a cmp but no hash defined, the object can't be hashed */

Original file line number	Diff line number	Diff line change
`@@ -914,7 +914,7 @@ PyObject_Hash(PyObject *v)`
`914`	`914`	`PyTypeObject *tp = v->ob_type;`
`915`	`915`	`if (tp->tp_hash != NULL)`
`916`	`916`	`return (*tp->tp_hash)(v);`
`917`		`- if (tp->tp_compare == NULL) {`
	`917`	`+ if (tp->tp_compare == NULL && tp->tp_richcompare == NULL) {`
`918`	`918`	`return _Py_HashPointer(v); /* Use address as hash value */`
`919`	`919`	`}`
`920`	`920`	`/* If there's a cmp but no hash defined, the object can't be hashed */`