mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-22 09:45:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

handle old-style instances

Browse source
This commit is contained in:
Benjamin Peterson 2011-05-23 17:11:21 -05:00
parent 8de87a6403
commit fd89af59e8
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Objects/object.c
View file

@ -1906,14 +1906,21 @@ _dir_object(PyObject *obj)
{ {
PyObject *result = NULL; PyObject *result = NULL;
static PyObject *dir_str = NULL; static PyObject *dir_str = NULL;
PyObject *dirfunc = _PyObject_LookupSpecial(obj, "__dir__", &dir_str); PyObject *dirfunc;
assert(obj); assert(obj);
if (dirfunc == NULL) { if (PyInstance_Check(obj)) {
dirfunc = PyObject_GetAttrString(obj, "__dir__");
if (dirfunc == NULL && !PyErr_ExceptionMatches(PyExc_AttributeError))
return NULL;
}
else {
dirfunc = _PyObject_LookupSpecial(obj, "__dir__", &dir_str);
if (PyErr_Occurred()) if (PyErr_Occurred())
return NULL; return NULL;
}
if (dirfunc == NULL) {
/* use default implementation */ /* use default implementation */
PyErr_Clear();
if (PyModule_Check(obj)) if (PyModule_Check(obj))
result = _specialized_dir_module(obj); result = _specialized_dir_module(obj);
else if (PyType_Check(obj) || PyClass_Check(obj)) else if (PyType_Check(obj) || PyClass_Check(obj))