diff options
| -rw-r--r-- | Lib/test/test_descr.py | 12 | ||||
| -rw-r--r-- | Lib/test/test_descrtut.py | 2 | ||||
| -rw-r--r-- | Objects/typeobject.c | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py index 426b2d4b0e..bbd4372461 100644 --- a/Lib/test/test_descr.py +++ b/Lib/test/test_descr.py @@ -678,9 +678,9 @@ def pymods(): class MM(MT): def __init__(self): MT.__init__(self) - def __getattr__(self, name): + def __getattribute__(self, name): log.append(("getattr", name)) - return MT.__getattr__(self, name) + return MT.__getattribute__(self, name) def __setattr__(self, name, value): log.append(("setattr", name, value)) MT.__setattr__(self, name, value) @@ -881,8 +881,8 @@ def dynamics(): if name == "spam": return "spam" else: - return object.__getattr__(self, name) - C.__getattr__ = mygetattr + return object.__getattribute__(self, name) + C.__getattribute__ = mygetattr verify(a.spam == "spam") a.new = 12 verify(a.new == 12) @@ -1105,11 +1105,11 @@ def overloading(): class C(B): - def __getattr__(self, name): + def __getattribute__(self, name): if name == "foo": return ("getattr", name) else: - return B.__getattr__(self, name) + return B.__getattribute__(self, name) def __setattr__(self, name, value): if name == "foo": self.setattr = (name, value) diff --git a/Lib/test/test_descrtut.py b/Lib/test/test_descrtut.py index a0fe0f1b49..e72567dabe 100644 --- a/Lib/test/test_descrtut.py +++ b/Lib/test/test_descrtut.py @@ -192,7 +192,7 @@ Instead, you can get the same information from the list type: '__delitem__', '__eq__', '__ge__', - '__getattr__', + '__getattribute__', '__getitem__', '__getslice__', '__gt__', diff --git a/Objects/typeobject.c b/Objects/typeobject.c index 9e6d3dfc06..5f8fd012e7 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -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); |