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

Change the name of the __getattr__ special method for new-style

Browse source 
classes to __getattribute__, to make it crystal-clear that it doesn't
have the same semantics as overriding __getattr__ on classic classes.

This is a halfway checkin -- I'll proceed to add a __getattr__ hook
that works the way it works in classic classes.
This commit is contained in:
Guido van Rossum 2001-09-21 19:29:08 +00:00
parent dbb718fa87
commit 867a8d2e26
3 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Objects/typeobject.c
View file

@ -2061,8 +2061,8 @@ static struct wrapperbase tab_repr[] = {
};
static struct wrapperbase tab_getattr[] = {
{"__getattr__", (wrapperfunc)wrap_binaryfunc,
"x.__getattr__('name') <==> x.name"},
{"__getattribute__", (wrapperfunc)wrap_binaryfunc,
"x.__getattribute__('name') <==> x.name"},
{0}
};
@ -2877,7 +2877,7 @@ slot_tp_getattro(PyObject *self, PyObject *name)
static PyObject *getattr_str = NULL;
if (getattr_str == NULL) {
getattr_str = PyString_InternFromString("__getattr__");
getattr_str = PyString_InternFromString("__getattribute__");
if (getattr_str == NULL)
return NULL;
}
@ -3196,7 +3196,7 @@ override_slots(PyTypeObject *type, PyObject *dict)
TPSLOT("__hash__", tp_hash, slot_tp_hash);
TPSLOT("__call__", tp_call, slot_tp_call);
TPSLOT("__str__", tp_str, slot_tp_str);
TPSLOT("__getattr__", tp_getattro, slot_tp_getattro);
TPSLOT("__getattribute__", tp_getattro, slot_tp_getattro);
TPSLOT("__setattr__", tp_setattro, slot_tp_setattro);
TPSLOT("__lt__", tp_richcompare, slot_tp_richcompare);
TPSLOT("__le__", tp_richcompare, slot_tp_richcompare);