Visitar URL original
gh-93955: Use unbound methods for slot `__getattr__` and `__getattribute__` by Fidget-Spinner · Pull Request #93956 · python/cpython · GitHub
Skip to content

gh-93955: Use unbound methods for slot __getattr__ and __getattribute__ #93956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Fidget-Spinner merged 7 commits into from
Jun 18, 2022
Merged

gh-93955: Use unbound methods for slot __getattr__ and __getattribute__ #93956

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
91fa05e
Use unbound methods for slot `__getattr__`
Fidget-Spinner Jun 17, 2022
4c28ac6
📜🤖 Added by blurb_it.
blurb-it[bot] Jun 17, 2022
c2b7441
fix refleak
Fidget-Spinner Jun 17, 2022
59139a1
Merge branch 'unbound_method_call_attribute' of https://github.com/Fi…
Fidget-Spinner Jun 17, 2022
83809ba
Remove call_attribute
Fidget-Spinner Jun 17, 2022
c83149d
re-add speed hacks
Fidget-Spinner Jun 17, 2022
0e14cc7
fix comment
Fidget-Spinner Jun 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Use unbound methods for slot __getattr__
  • Loading branch information
@Fidget-Spinner
Fidget-Spinner committed Jun 17, 2022
commit 91fa05e41a29b872a1ee8b6903bcf939b2486fc8
27 changes: 11 additions & 16 deletions Objects/typeobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7805,38 +7805,33 @@ slot_tp_getattr_hook(PyObject *self, PyObject *name)
{
PyTypeObject *tp = Py_TYPE(self);
PyObject *getattr, *getattribute, *res;
PyObject *args[] = { self, name };
PyThreadState *tstate = _PyThreadState_GET();

/* speed hack: we could use lookup_maybe, but that would resolve the
method fully for each attribute lookup for classes with
__getattr__, even when the attribute is present. So we use
_PyType_Lookup and create the method only when needed, with
call_attribute. */
getattr = _PyType_Lookup(tp, &_Py_ID(__getattr__));
Comment thread
Fidget-Spinner marked this conversation as resolved.
int unbound_getattr;
getattr = lookup_maybe_method(self, &_Py_ID(__getattr__), &unbound_getattr);
if (getattr == NULL) {
/* No __getattr__ hook: use a simpler dispatcher */
tp->tp_getattro = slot_tp_getattro;
return slot_tp_getattro(self, name);
}
Py_INCREF(getattr);
/* speed hack: we could use lookup_maybe, but that would resolve the
method fully for each attribute lookup for classes with
__getattr__, even when self has the default __getattribute__
method. So we use _PyType_Lookup and create the method only when
needed, with call_attribute. */
getattribute = _PyType_Lookup(tp, &_Py_ID(__getattribute__));

int unbound_getattribute;
getattribute = lookup_maybe_method(self, &_Py_ID(__getattribute__),
&unbound_getattribute);
if (getattribute == NULL ||
(Py_IS_TYPE(getattribute, &PyWrapperDescr_Type) &&
((PyWrapperDescrObject *)getattribute)->d_wrapped ==
(void *)PyObject_GenericGetAttr))
res = PyObject_GenericGetAttr(self, name);
else {
Py_INCREF(getattribute);
res = call_attribute(self, getattribute, name);
res = vectorcall_unbound(tstate, unbound_getattribute, getattribute,
args, 2);
Py_DECREF(getattribute);
}
if (res == NULL && PyErr_ExceptionMatches(PyExc_AttributeError)) {
PyErr_Clear();
res = call_attribute(self, getattr, name);
res = vectorcall_unbound(tstate, unbound_getattr, getattr, args, 2);
}
Py_DECREF(getattr);
return res;
Expand Down