diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2012-11-11 18:36:51 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2012-11-11 18:36:51 (GMT) |
| commit | e11fecb5a97595a91506eeba8fd5a185d35ace9e (patch) | |
| tree | 9506989d45e8ead66f521f64892448289ca05ce0 /Objects/weakrefobject.c | |
| parent | 19e568d254bea8202703302d0ada9bc93f99331a (diff) | |
| download | cpython-e11fecb5a97595a91506eeba8fd5a185d35ace9e.zip cpython-e11fecb5a97595a91506eeba8fd5a185d35ace9e.tar.gz cpython-e11fecb5a97595a91506eeba8fd5a185d35ace9e.tar.bz2 | |
Issue #16453: Fix equality testing of dead weakref objects.
Also add tests for ordering and hashing.
Diffstat (limited to 'Objects/weakrefobject.c')
| -rw-r--r-- | Objects/weakrefobject.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Objects/weakrefobject.c b/Objects/weakrefobject.c index 13323cf..dae3c24 100644 --- a/Objects/weakrefobject.c +++ b/Objects/weakrefobject.c @@ -195,9 +195,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); |