closes bpo-32980 Remove _PyFrame_Init (GH-5965)

diff --git a/Include/pylifecycle.h b/Include/pylifecycle.h
index 659c6df644e34f6e5d1c0f604792698e76961f84..95dd55b0517370c3232a6080db873a49e3dcd948 100644 (file)
--- a/Include/pylifecycle.h
+++ b/Include/pylifecycle.h
@@ -148,7 +148,6 @@ PyAPI_FUNC(int) _PySys_EndInit(PyObject *sysdict, _PyMainInterpreterConfig *conf
 PyAPI_FUNC(_PyInitError) _PyImport_Init(PyInterpreterState *interp);
 PyAPI_FUNC(void) _PyExc_Init(PyObject * bltinmod);
 PyAPI_FUNC(_PyInitError) _PyImportHooks_Init(void);
-PyAPI_FUNC(int) _PyFrame_Init(void);
 PyAPI_FUNC(int) _PyFloat_Init(void);
 PyAPI_FUNC(int) PyByteArray_Init(void);
 PyAPI_FUNC(_PyInitError) _Py_HashRandomization_Init(const _PyCoreConfig *);

diff --git a/Objects/frameobject.c b/Objects/frameobject.c
index d308457b7547d16da6c88a0c91dfbc13ed819d66..b9f380d7b60dec454751da92dd98a23198be565d 100644 (file)
--- a/Objects/frameobject.c
+++ b/Objects/frameobject.c
@@ -552,14 +552,6 @@ PyTypeObject PyFrame_Type = {
 
 _Py_IDENTIFIER(__builtins__);
 
-int _PyFrame_Init()
-{
-    /* Before, PyId___builtins__ was a string created explicitly in
-       this function. Now there is nothing to initialize anymore, but
-       the function is kept for backward compatibility. */
-    return 1;
-}
-
 PyFrameObject* _Py_HOT_FUNCTION
 _PyFrame_New_NoTrack(PyThreadState *tstate, PyCodeObject *code,
                      PyObject *globals, PyObject *locals)

diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
index 5db586e15dffc04437d5381f53ae9d037b2d6b41..a9b9470c726521e2b15b5cddce7a8167d534b24d 100644 (file)
--- a/Python/pylifecycle.c
+++ b/Python/pylifecycle.c
@@ -690,9 +690,6 @@ _Py_InitializeCore(const _PyCoreConfig *core_config)
 
     _Py_ReadyTypes();
 
-    if (!_PyFrame_Init())
-        return _Py_INIT_ERR("can't init frames");
-
     if (!_PyLong_Init())
         return _Py_INIT_ERR("can't init longs");