From e18df23d5d76e931f5163872bbdf7943f6ef7c5b Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Sat, 9 May 2009 19:24:36 +0000 Subject: Merged revisions 72518 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r72518 | benjamin.peterson | 2009-05-09 14:18:36 -0500 (Sat, 09 May 2009) | 1 line clear error state properly ........ --- Objects/abstract.c | 1 + 1 file changed, 1 insertion(+) diff --git a/Objects/abstract.c b/Objects/abstract.c index 83f5367..52c9025 100644 --- a/Objects/abstract.c +++ b/Objects/abstract.c @@ -98,6 +98,7 @@ _PyObject_LengthHint(PyObject *o, Py_ssize_t defaultvalue) if (ro == NULL) { if (!PyErr_ExceptionMatches(PyExc_TypeError)) return -1; + PyErr_Clear(); return defaultvalue; } rv = PyLong_Check(ro) ? PyLong_AsSsize_t(ro) : defaultvalue; -- cgit v0.12