]> granicus.if.org Git - python/commitdiff
only need to catch an TypeError here
authorBenjamin Peterson <benjamin@python.org>
Sat, 9 May 2009 19:30:46 +0000 (19:30 +0000)
committerBenjamin Peterson <benjamin@python.org>
Sat, 9 May 2009 19:30:46 +0000 (19:30 +0000)
Objects/abstract.c

index 52c90259e86f3e734992371cc7fb12cdbfbacd21..cc125f5fa47e807f308913f4765d4a8a4f21d19b 100644 (file)
@@ -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) &&
-                       !PyErr_ExceptionMatches(PyExc_AttributeError))
-                               return -1;
+               if (!PyErr_ExceptionMatches(PyExc_TypeError))
+                       return -1;
                PyErr_Clear();
        }