mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-12 13:55:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

only catch AttributeError in hasattr() #9666

Browse source
This commit is contained in:
Benjamin Peterson 2010-08-24 03:26:23 +00:00
parent 9cf5ef4cc0
commit 17689991e6
5 changed files with 19 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Python/bltinmodule.c
View file

@ -893,24 +893,21 @@ builtin_hasattr(PyObject *self, PyObject *args)
}
v = PyObject_GetAttr(v, name);
if (v == NULL) {
if (!PyErr_ExceptionMatches(PyExc_Exception))
return NULL;
else {
if (PyErr_ExceptionMatches(PyExc_AttributeError)) {
PyErr_Clear();
Py_INCREF(Py_False);
return Py_False;
Py_RETURN_FALSE;
}
return NULL;
}
Py_DECREF(v);
Py_INCREF(Py_True);
return Py_True;
Py_RETURN_TRUE;
}
PyDoc_STRVAR(hasattr_doc,
"hasattr(object, name) -> bool\n\
\n\
Return whether the object has an attribute with the given name.\n\
(This is done by calling getattr(object, name) and catching exceptions.)");
(This is done by calling getattr(object, name) and catching AttributeError.)");
static PyObject *