mirror of
https://github.com/python/cpython.git
synced 2026-04-23 04:11:18 +00:00
bpo-35444: Fix error handling when fail to look up builtin "getattr". (GH-11047) (GH-11107)
(cherry picked from commit bb86bf4c4e)
This commit is contained in:
parent
62674f3a36
commit
3cae16d2e9
7 changed files with 29 additions and 30 deletions
|
|
@ -4419,6 +4419,20 @@ PyEval_GetBuiltins(void)
|
|||
return current_frame->f_builtins;
|
||||
}
|
||||
|
||||
/* Convenience function to get a builtin from its name */
|
||||
PyObject *
|
||||
_PyEval_GetBuiltinId(_Py_Identifier *name)
|
||||
{
|
||||
PyObject *attr = _PyDict_GetItemIdWithError(PyEval_GetBuiltins(), name);
|
||||
if (attr) {
|
||||
Py_INCREF(attr);
|
||||
}
|
||||
else if (!PyErr_Occurred()) {
|
||||
PyErr_SetObject(PyExc_AttributeError, _PyUnicode_FromId(name));
|
||||
}
|
||||
return attr;
|
||||
}
|
||||
|
||||
PyObject *
|
||||
PyEval_GetLocals(void)
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue