diff options
| -rw-r--r-- | Lib/test/test_descr.py | 1 | ||||
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Objects/object.c | 8 |
3 files changed, 9 insertions, 3 deletions
diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py index 1fe0de5..dc18f33 100644 --- a/Lib/test/test_descr.py +++ b/Lib/test/test_descr.py @@ -1718,6 +1718,7 @@ order (MRO) for bases """ ("__exit__", run_context, swallow, set(), {"__enter__" : iden}), ("__complex__", complex, complex_num, set(), {}), ("__format__", format, format_impl, set(), {}), + ("__dir__", dir, empty_seq, set(), {}), ] class Checker(object): @@ -9,6 +9,9 @@ What's New in Python 2.7.2? Core and Builtins ----------------- +- Correct lookup of __dir__ on objects. Among other things, this causes errors + besides AttributeError found on lookup to be propagated. + - Issue #1195: Fix input() if it is interrupted by CTRL+d and then CTRL+c, clear the end-of-file indicator after CTRL+d. diff --git a/Objects/object.c b/Objects/object.c index b6ad5de..1e033d2 100644 --- a/Objects/object.c +++ b/Objects/object.c @@ -1905,11 +1905,13 @@ static PyObject * _dir_object(PyObject *obj) { PyObject *result = NULL; - PyObject *dirfunc = PyObject_GetAttrString((PyObject *)obj->ob_type, - "__dir__"); + static PyObject *dir_str = NULL; + PyObject *dirfunc = _PyObject_LookupSpecial(obj, "__dir__", &dir_str); assert(obj); if (dirfunc == NULL) { + if (PyErr_Occurred()) + return NULL; /* use default implementation */ PyErr_Clear(); if (PyModule_Check(obj)) @@ -1921,7 +1923,7 @@ _dir_object(PyObject *obj) } else { /* use __dir__ */ - result = PyObject_CallFunctionObjArgs(dirfunc, obj, NULL); + result = PyObject_CallFunctionObjArgs(dirfunc, NULL); Py_DECREF(dirfunc); if (result == NULL) return NULL; |