only need to catch an TypeError here

b0ba27df · Benjamin Peterson · e18df23d · b0ba27df
Commit b0ba27df authored May 09, 2009 by Benjamin Peterson
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

Objects/abstract.c Objects/abstract.c +2 -3

No files found.
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -83,9 +83,8 @@ _PyObject_LengthHint(PyObject *o, Py_ssize_t defaultvalue)
 	if (rv >= 0)
 		return rv;
 	if (PyErr_Occurred()) {
-		if (!PyErr_ExceptionMatches(PyExc_TypeError) &&
+		if (!PyErr_ExceptionMatches(PyExc_TypeError))
-			!PyErr_ExceptionMatches(PyExc_AttributeError))
+			return -1;
-				return -1;
 		PyErr_Clear();
 	}