[Python-checkins] cpython (3.1): correctly lookup dir

Mon May 23 23:32:13 CEST 2011

http://hg.python.org/cpython/rev/bdfbe0b499af
changeset: 70311:bdfbe0b499af
branch: 3.1
parent: 70292:b538445a9df8
user: Benjamin Peterson <benjamin at python.org>
date: Mon May 23 16:11:05 2011 -0500
summary:
 correctly lookup __dir__
files:
 Lib/test/test_descr.py | 1 +
 Misc/NEWS | 3 +++
 Objects/object.c | 11 ++++++-----
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
--- a/Lib/test/test_descr.py
+++ b/Lib/test/test_descr.py
@@ -1595,6 +1595,7 @@
 # probably not worth it.
 # ("__enter__", run_context, iden),
 # ("__exit__", run_context, iden),
+ ("__dir__", dir, empty_seq, set(), {}),
 ]
 
 class Checker(object):
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@
 Core and Builtins
 -----------------
 
+- Correct lookup of __dir__ on objects. Among other things, this causes errors
+ besides AttributeError found on lookup to be propagated.
+
 - Issue #12060: Use sig_atomic_t type and volatile keyword in the signal
 module. Patch written by Charles-François Natali.
 
diff --git a/Objects/object.c b/Objects/object.c
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -1348,14 +1348,15 @@
 static PyObject *
 _dir_object(PyObject *obj)
 {
- PyObject * result = NULL;
- PyObject * dirfunc = PyObject_GetAttrString((PyObject*)obj->ob_type,
- "__dir__");
+ PyObject *result = NULL;
+ 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))
 result = _specialized_dir_module(obj);
 else if (PyType_Check(obj))
@@ -1365,7 +1366,7 @@
 }
 else {
 /* use __dir__ */
- result = PyObject_CallFunctionObjArgs(dirfunc, obj, NULL);
+ result = PyObject_CallFunctionObjArgs(dirfunc, NULL);
 Py_DECREF(dirfunc);
 if (result == NULL)
 return NULL;
-- 
Repository URL: http://hg.python.org/cpython


[Python-checkins] cpython (3.1): correctly lookup __dir__

[Python-checkins] cpython (3.1): correctly lookup dir