bpo-37249: add declaration of _PyObject_GetMethod (GH-14015)

jdemeyer · methane · commit b2f94730d947 · 2019-06-14T19:37:15.000+09:00
diff --git a/Include/cpython/object.h b/Include/cpython/object.h
@@ -318,6 +318,9 @@ PyAPI_FUNC(int) _PyObject_HasAttrId(PyObject *, struct _Py_Identifier *);
 */
 PyAPI_FUNC(int) _PyObject_LookupAttr(PyObject *, PyObject *, PyObject **);
 PyAPI_FUNC(int) _PyObject_LookupAttrId(PyObject *, struct _Py_Identifier *, PyObject **);
+
+PyAPI_FUNC(int) _PyObject_GetMethod(PyObject *obj, PyObject *name, PyObject **method);
+
 PyAPI_FUNC(PyObject **) _PyObject_GetDictPtr(PyObject *);
 PyAPI_FUNC(PyObject *) _PyObject_NextNotImplemented(PyObject *);
 PyAPI_FUNC(void) PyObject_CallFinalizer(PyObject *);
diff --git a/Objects/call.c b/Objects/call.c
@@ -1211,9 +1211,6 @@ object_vacall(PyObject *base, PyObject *callable, va_list vargs)
 }
 
 
-/* Private API for the LOAD_METHOD opcode. */
-extern int _PyObject_GetMethod(PyObject *, PyObject *, PyObject **);
-
 PyObject *
 PyObject_CallMethodObjArgs(PyObject *obj, PyObject *name, ...)
 {
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -38,10 +38,6 @@
 #  error "ceval.c must be build with Py_BUILD_CORE define for best performance"
 #endif
 
-/* Private API for the LOAD_METHOD opcode. */
-extern int _PyObject_GetMethod(PyObject *, PyObject *, PyObject **);
-
-typedef PyObject *(*callproc)(PyObject *, PyObject *, PyObject *);
 
 /* Forward declarations */
 Py_LOCAL_INLINE(PyObject *) call_function(

Original file line number	Diff line number	Diff line change
`@@ -1211,9 +1211,6 @@ object_vacall(PyObject base, PyObject callable, va_list vargs)`
`1211`	`1211`	`}`
`1212`	`1212`
`1213`	`1213`
`1214`		`-/* Private API for the LOAD_METHOD opcode. */`
`1215`		`-extern int _PyObject_GetMethod(PyObject , PyObject , PyObject **);`
`1216`		`-`
`1217`	`1214`	`PyObject *`
`1218`	`1215`	`PyObject_CallMethodObjArgs(PyObject obj, PyObject name, ...)`
`1219`	`1216`	`{`