From 01e8e6d6e8bd22049c3d850aed0262578c185390 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Mon, 23 May 2011 18:17:55 -0500 Subject: must clear an AttributeError if it is set --- Objects/object.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Objects/object.c b/Objects/object.c index 5cf15b6a40..94a18d37db 100644 --- a/Objects/object.c +++ b/Objects/object.c @@ -1911,8 +1911,12 @@ _dir_object(PyObject *obj) 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); -- cgit v1.2.1