From: Thomas Nyberg <tomnyberg@gmail.com>
Date: Sun, 4 Mar 2018 06:06:01 +0000 (+0100)
Subject: closes bpo-32980 Remove _PyFrame_Init (GH-5965)
X-Git-Tag: v3.8.0a1~2131
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7023644e0c310a3006c984318c2c111c468735b4;p=python

closes bpo-32980 Remove _PyFrame_Init (GH-5965)
---

diff --git a/Include/pylifecycle.h b/Include/pylifecycle.h
index 659c6df644..95dd55b051 100644
--- 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 d308457b75..b9f380d7b6 100644
--- 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 5db586e15d..a9b9470c72 100644
--- 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");