mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix for SF bug #472940: can't getattr() attribute shown by dir()

Browse source 
There really isn't a good reason for instance method objects to have
their own __dict__, __doc__ and __name__ properties that just delegate
the request to the function (callable); the default attribute behavior
already does this.

The test suite had to be fixed because the error changes from
TypeError to AttributeError.
This commit is contained in:
Guido van Rossum 2001-10-22 02:00:09 +00:00
parent 51c18166bb
commit 56ff387a7e
2 changed files with 6 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Objects/classobject.c
View file

@ -2019,33 +2019,6 @@ static PyMemberDef instancemethod_memberlist[] = {
{NULL} /* Sentinel */
};
/* __dict__, __doc__ and __name__ are retrieved from im_func */
static PyObject *
im_get_dict(PyMethodObject *im)
{
return PyObject_GetAttrString(im->im_func, "__dict__");
}
static PyObject *
im_get_doc(PyMethodObject *im)
{
return PyObject_GetAttrString(im->im_func, "__doc__");
}
static PyObject *
im_get_name(PyMethodObject *im)
{
return PyObject_GetAttrString(im->im_func, "__name__");
}
static PyGetSetDef instancemethod_getsetlist[] = {
{"__dict__", (getter)im_get_dict, NULL, "same as im_func.__dict__"},
{"__doc__", (getter)im_get_doc, NULL, "same as im_func.__doc__"},
{"__name__", (getter)im_get_name, NULL, "same as im_func.__name__"},
{NULL} /* Sentinel */
};
/* The getattr() implementation for PyMethod objects is similar to
PyObject_GenericGetAttr(), but instead of looking in __dict__ it
asks im_self for the attribute. Then the error handling is a bit
@ -2350,7 +2323,7 @@ PyTypeObject PyMethod_Type = {
0, /* tp_iternext */
0, /* tp_methods */
instancemethod_memberlist, /* tp_members */
instancemethod_getsetlist, /* tp_getset */
0, /* tp_getset */
0, /* tp_base */
0, /* tp_dict */
instancemethod_descr_get, /* tp_descr_get */