Issue #16453: Fix equality testing of dead weakref objects.

Also add tests for ordering and hashing.
This commit is contained in:
Antoine Pitrou 2012-11-11 19:37:41 +01:00
commit f6a50cfa07
3 changed files with 93 additions and 24 deletions

View file

@ -198,9 +198,13 @@ weakref_richcompare(PyWeakReference* self, PyWeakReference* other, int op)
}
if (PyWeakref_GET_OBJECT(self) == Py_None
|| PyWeakref_GET_OBJECT(other) == Py_None) {
PyObject *res = self==other ? Py_True : Py_False;
Py_INCREF(res);
return res;
int res = (self == other);
if (op == Py_NE)
res = !res;
if (res)
Py_RETURN_TRUE;
else
Py_RETURN_FALSE;
}
return PyObject_RichCompare(PyWeakref_GET_OBJECT(self),
PyWeakref_GET_OBJECT(other), op);