summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Nyberg <tomnyberg@gmail.com>2018-03-04 06:06:01 (GMT)
committerBenjamin Peterson <benjamin@python.org>2018-03-04 06:06:01 (GMT)
commit7023644e0c310a3006c984318c2c111c468735b4 (patch)
tree5d85c139dbe66ba318d3f469cdbafe61634e13db
parent0e6c8ee2358a2e23117501826c008842acb835ac (diff)
downloadcpython-7023644e0c310a3006c984318c2c111c468735b4.zip
cpython-7023644e0c310a3006c984318c2c111c468735b4.tar.gz
cpython-7023644e0c310a3006c984318c2c111c468735b4.tar.bz2
closes bpo-32980 Remove _PyFrame_Init (GH-5965)
-rw-r--r--Include/pylifecycle.h1
-rw-r--r--Objects/frameobject.c8
-rw-r--r--Python/pylifecycle.c3
3 files changed, 0 insertions, 12 deletions
diff --git a/Include/pylifecycle.h b/Include/pylifecycle.h
index 659c6df..95dd55b 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 d308457..b9f380d 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 5db586e..a9b9470 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");