From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 9 May 2009 19:03:05 +0000 (+0000)
Subject: ignore AttributeErrors for classic classes
X-Git-Tag: v2.7a1~1226
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a7dc949e170237d6e59a0c0c5c784a00960756a7;p=python

ignore AttributeErrors for classic classes
---

diff --git a/Objects/abstract.c b/Objects/abstract.c
index 99b22db71b..e90710c4f5 100644
--- a/Objects/abstract.c
+++ b/Objects/abstract.c
@@ -116,7 +116,8 @@ _PyObject_LengthHint(PyObject *o, Py_ssize_t defaultvalue)
 	ro = PyObject_CallFunctionObjArgs(hintmeth, NULL);
 	Py_DECREF(hintmeth);
 	if (ro == NULL) {
-		if (!PyErr_ExceptionMatches(PyExc_TypeError))
+		if (!PyErr_ExceptionMatches(PyExc_TypeError) &&
+		    !PyErr_ExceptionMatches(PyExc_AttributeError))
 			return -1;
 		return defaultvalue;
 	}