commit 7f5cd45f1d756e9d749c87ebd62cdb7ad7299366
author Benjamin Peterson <benjamin@python.org> Mon May 23 18:17:55 2011 -0500
committer Benjamin Peterson <benjamin@python.org> Mon May 23 18:17:55 2011 -0500
tree d74b80b008579afdcd4d5642f827f544bf9c6aac
parent fd89af59e84b4c9032ac22e67e1b7b4fefbb601d

must clear an AttributeError if it is set

Objects/object.c

diff --git a/Objects/object.c b/Objects/object.c
index 5cf15b6..94a18d3 100644
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -1911,8 +1911,12 @@
     assert(obj);
     if (PyInstance_Check(obj)) {
         dirfunc = PyObject_GetAttrString(obj, "__dir__");
-        if (dirfunc == NULL && !PyErr_ExceptionMatches(PyExc_AttributeError))
-            return NULL;
+        if (dirfunc == NULL) {
+            if (PyErr_ExceptionMatches(PyExc_AttributeError))
+                PyErr_Clear();
+            else
+                return NULL;
+        }
     }
     else {
         dirfunc = _PyObject_LookupSpecial(obj, "__dir__", &dir_str);