diff options
| -rw-r--r-- | Include/pylifecycle.h | 2 | ||||
| -rw-r--r-- | Python/import.c | 10 | ||||
| -rw-r--r-- | Python/pylifecycle.c | 2 |
3 files changed, 3 insertions, 11 deletions
diff --git a/Include/pylifecycle.h b/Include/pylifecycle.h index fa751692a6..4c87428a23 100644 --- a/Include/pylifecycle.h +++ b/Include/pylifecycle.h @@ -127,7 +127,7 @@ PyAPI_FUNC(const char *) _Py_gitversion(void); PyAPI_FUNC(PyObject *) _PyBuiltin_Init(void); PyAPI_FUNC(_PyInitError) _PySys_BeginInit(PyObject **sysmod); PyAPI_FUNC(int) _PySys_EndInit(PyObject *sysdict); -PyAPI_FUNC(_PyInitError) _PyImport_Init(void); +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); diff --git a/Python/import.c b/Python/import.c index 57521e4920..9a9857385c 100644 --- a/Python/import.c +++ b/Python/import.c @@ -31,8 +31,6 @@ extern struct _inittab _PyImport_Inittab[]; struct _inittab *PyImport_Inittab = _PyImport_Inittab; -static PyObject *initstr = NULL; - /*[clinic input] module _imp [clinic start generated code]*/ @@ -43,14 +41,8 @@ module _imp /* Initialize things */ _PyInitError -_PyImport_Init(void) +_PyImport_Init(PyInterpreterState *interp) { - PyInterpreterState *interp = PyThreadState_Get()->interp; - initstr = PyUnicode_InternFromString("__init__"); - if (initstr == NULL) { - return _Py_INIT_ERR("Can't initialize import variables"); - } - interp->builtins_copy = PyDict_Copy(interp->builtins); if (interp->builtins_copy == NULL) { return _Py_INIT_ERR("Can't backup builtins dict"); diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index b615c79998..504036c3ef 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -751,7 +751,7 @@ _Py_InitializeCore(const _PyCoreConfig *config) PySys_SetObject("__stderr__", pstderr); Py_DECREF(pstderr); - err = _PyImport_Init(); + err = _PyImport_Init(interp); if (_Py_INIT_FAILED(err)) { return err; } |