diff options
| author | Raymond Hettinger <python@rcn.com> | 2008-06-11 12:06:49 (GMT) |
|---|---|---|
| committer | Raymond Hettinger <python@rcn.com> | 2008-06-11 12:06:49 (GMT) |
| commit | f0bc3cbdc05e99a1a2e93fac768571f13f354a27 (patch) | |
| tree | 787854ff2998823237305a1a6c5901ae10b61ac4 | |
| parent | 4267be6478d38445b8632e678e3cf459490bed6b (diff) | |
| download | cpython-f0bc3cbdc05e99a1a2e93fac768571f13f354a27.zip cpython-f0bc3cbdc05e99a1a2e93fac768571f13f354a27.tar.gz cpython-f0bc3cbdc05e99a1a2e93fac768571f13f354a27.tar.bz2 | |
Issue 3051: Let heapq work with either __lt__ or __le__.
| -rw-r--r-- | Modules/_heapqmodule.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Modules/_heapqmodule.c b/Modules/_heapqmodule.c index 7a64161..8edf626 100644 --- a/Modules/_heapqmodule.c +++ b/Modules/_heapqmodule.c @@ -17,13 +17,12 @@ static int cmp_lt(PyObject *x, PyObject *y) { int cmp; - cmp = PyObject_RichCompareBool(x, y, Py_LT); - if (cmp == -1 && PyErr_ExceptionMatches(PyExc_AttributeError)) { - PyErr_Clear(); - cmp = PyObject_RichCompareBool(y, x, Py_LE); - if (cmp != -1) - cmp = 1 - cmp; - } + + if (PyObject_HasAttrString(x, "__lt__")) + return PyObject_RichCompareBool(x, y, Py_LT); + cmp = PyObject_RichCompareBool(y, x, Py_LE); + if (cmp != -1) + cmp = 1 - cmp; return cmp; } |