From f0bc3cbdc05e99a1a2e93fac768571f13f354a27 Mon Sep 17 00:00:00 2001 From: Raymond Hettinger Date: Wed, 11 Jun 2008 12:06:49 +0000 Subject: [PATCH] Issue 3051: Let heapq work with either __lt__ or __le__. --- Modules/_heapqmodule.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Modules/_heapqmodule.c b/Modules/_heapqmodule.c index 7a6416155d7..8edf626effd 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; }