From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 9 May 2009 19:18:36 +0000 (+0000)
Subject: clear error state properly
X-Git-Tag: v2.7a1~1224
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ceea163e7ce7a4d0952000801ba4856931b47103;p=python

clear error state properly
---

diff --git a/Objects/abstract.c b/Objects/abstract.c
index e90710c4f5..4da7e0035e 100644
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -119,6 +119,7 @@ _PyObject_LengthHint(PyObject *o, Py_ssize_t defaultvalue)
 		if (!PyErr_ExceptionMatches(PyExc_TypeError) &&
 		    !PyErr_ExceptionMatches(PyExc_AttributeError))
 			return -1;
+		PyErr_Clear();
 		return defaultvalue;
 	}
 	rv = PyLong_Check(ro) ? PyLong_AsSsize_t(ro) : defaultvalue;