commit 3cae16d2e98ffaa89ddd311df70a857dfaff4020
author Serhiy Storchaka <storchaka@gmail.com> Tue Dec 11 10:51:27 2018 +0200
committer GitHub <noreply@github.com> Tue Dec 11 10:51:27 2018 +0200
tree 3670fd9018afba95a6498779d3bc48f376ac720e
parent 62674f3a36ec55f86a5f20ee028a37fbd549bd6c

bpo-35444: Fix error handling when fail to look up builtin "getattr". (GH-11047) (GH-11107)

(cherry picked from commit bb86bf4c4eaa30b1f5192dab9f389ce0bb61114d)

Objects/methodobject.c

diff --git a/Objects/methodobject.c b/Objects/methodobject.c
index 2cf3146..f9bac19 100644
--- a/Objects/methodobject.c
+++ b/Objects/methodobject.c
@@ -103,16 +103,13 @@
 static PyObject *
 meth_reduce(PyCFunctionObject *m)
 {
-    PyObject *builtins;
-    PyObject *getattr;
     _Py_IDENTIFIER(getattr);
 
     if (m->m_self == NULL || PyModule_Check(m->m_self))
         return PyUnicode_FromString(m->m_ml->ml_name);
 
-    builtins = PyEval_GetBuiltins();
-    getattr = _PyDict_GetItemId(builtins, &PyId_getattr);
-    return Py_BuildValue("O(Os)", getattr, m->m_self, m->m_ml->ml_name);
+    return Py_BuildValue("N(Os)", _PyEval_GetBuiltinId(&PyId_getattr),
+                         m->m_self, m->m_ml->ml_name);
 }
 
 static PyMethodDef meth_methods[] = {