gh-102213: Revert "gh-102213: Optimize the performance of __getattr__ (GH-102248)" (GH-103332)

This reverts commit aa0a73d1bc.
This commit is contained in:
Nikita Sobolev 2023-04-07 12:22:36 +03:00 committed by GitHub
parent efb0a2cf3a
commit 059bb04245
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 13 deletions

View file

@ -8274,17 +8274,14 @@ _Py_slot_tp_getattr_hook(PyObject *self, PyObject *name)
(Py_IS_TYPE(getattribute, &PyWrapperDescr_Type) &&
((PyWrapperDescrObject *)getattribute)->d_wrapped ==
(void *)PyObject_GenericGetAttr))
/* finding nothing is reasonable when __getattr__ is defined */
res = _PyObject_GenericTryGetAttr(self, name);
res = PyObject_GenericGetAttr(self, name);
else {
Py_INCREF(getattribute);
res = call_attribute(self, getattribute, name);
Py_DECREF(getattribute);
}
if (res == NULL) {
if (PyErr_ExceptionMatches(PyExc_AttributeError)) {
PyErr_Clear();
}
if (res == NULL && PyErr_ExceptionMatches(PyExc_AttributeError)) {
PyErr_Clear();
res = call_attribute(self, getattr, name);
}
Py_DECREF(getattr);