diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2018-12-11 10:13:14 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2018-12-11 10:13:14 (GMT) |
| commit | be6ec444729f727f304ae10f3a7e2feda3cc3aaa (patch) | |
| tree | e6f2d90acb8b9e9b6d9903e809656209b36e82df /Python | |
| parent | f74cabd9203cf3be97fdb3821a7fa0b74d7b2263 (diff) | |
| download | cpython-be6ec444729f727f304ae10f3a7e2feda3cc3aaa.zip cpython-be6ec444729f727f304ae10f3a7e2feda3cc3aaa.tar.gz cpython-be6ec444729f727f304ae10f3a7e2feda3cc3aaa.tar.bz2 | |
bpo-35444: Fix error handling when fail to look up builtin "getattr". (GH-11047) (GH-11107) (GH-11108)
(cherry picked from commit bb86bf4c4eaa30b1f5192dab9f389ce0bb61114d)
(cherry picked from commit 3cae16d2e98ffaa89ddd311df70a857dfaff4020)
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/ceval.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/Python/ceval.c b/Python/ceval.c index 36e9664..0b30cc1 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -4667,6 +4667,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) { |