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

bpo-32544: Speed up hasattr() and getattr() (GH-5173)

Browse source 
AttributeError was raised always when attribute is not found.
This commit skip raising AttributeError when `tp_getattro` is `PyObject_GenericGetAttr`.
It makes hasattr() and getattr() about 4x faster when attribute is not found.
This commit is contained in:
INADA Naoki 2018-01-16 20:52:41 +09:00 • committed by GitHub
parent b44c5169f6
commit 378edee0a3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 71 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Python/bltinmodule.c
View file

@ -1126,13 +1126,15 @@ builtin_getattr(PyObject *self, PyObject *const *args, Py_ssize_t nargs)
"getattr(): attribute name must be string");
return NULL;
}
result = PyObject_GetAttr(v, name);
if (result == NULL && dflt != NULL &&
PyErr_ExceptionMatches(PyExc_AttributeError))
{
PyErr_Clear();
Py_INCREF(dflt);
result = dflt;
if (dflt != NULL) {
result = _PyObject_GetAttrWithoutError(v, name);
if (result == NULL && !PyErr_Occurred()) {
Py_INCREF(dflt);
return dflt;
}
}
else {
result = PyObject_GetAttr(v, name);
}
return result;
}
@ -1189,10 +1191,9 @@ builtin_hasattr_impl(PyObject *module, PyObject *obj, PyObject *name)
"hasattr(): attribute name must be string");
return NULL;
}
v = PyObject_GetAttr(obj, name);
v = _PyObject_GetAttrWithoutError(obj, name);
if (v == NULL) {
if (PyErr_ExceptionMatches(PyExc_AttributeError)) {
PyErr_Clear();
if (!PyErr_Occurred()) {
Py_RETURN_FALSE;
}
return NULL;