Skip to content

bpo-38858: Add pycore_interp_init() code to factorize code #17483

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vstinner merged 1 commit into from
Dec 6, 2019
Merged

bpo-38858: Add pycore_interp_init() code to factorize code #17483

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 24 additions & 32 deletions Python/pylifecycle.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -702,42 +702,51 @@ pycore_init_import_warnings(PyThreadState *tstate, PyObject *sysmod)


static PyStatus
pyinit_config(_PyRuntimeState *runtime,
PyThreadState **tstate_p,
const PyConfig *config)
pycore_interp_init(PyThreadState *tstate)
{
_PyConfig_Write(config, runtime);
PyStatus status;

PyStatus status = pycore_init_runtime(runtime, config);
status = pycore_init_types(tstate);
if (_PyStatus_EXCEPTION(status)) {
return status;
}

PyThreadState *tstate;
status = pycore_create_interpreter(runtime, config, &tstate);
PyObject *sysmod;
status = _PySys_Create(tstate, &sysmod);
if (_PyStatus_EXCEPTION(status)) {
return status;
}
config = &tstate->interp->config;
*tstate_p = tstate;

status = pycore_init_types(tstate);
status = pycore_init_builtins(tstate);
if (_PyStatus_EXCEPTION(status)) {
return status;
}

PyObject *sysmod;
status = _PySys_Create(tstate, &sysmod);
return pycore_init_import_warnings(tstate, sysmod);
}


static PyStatus
pyinit_config(_PyRuntimeState *runtime,
PyThreadState **tstate_p,
const PyConfig *config)
{
_PyConfig_Write(config, runtime);

PyStatus status = pycore_init_runtime(runtime, config);
if (_PyStatus_EXCEPTION(status)) {
return status;
}

status = pycore_init_builtins(tstate);
PyThreadState *tstate;
status = pycore_create_interpreter(runtime, config, &tstate);
if (_PyStatus_EXCEPTION(status)) {
return status;
}
config = &tstate->interp->config;
*tstate_p = tstate;

status = pycore_init_import_warnings(tstate, sysmod);
status = pycore_interp_init(tstate);
if (_PyStatus_EXCEPTION(status)) {
return status;
}
Expand Down Expand Up @@ -1549,25 +1558,8 @@ new_interpreter(PyThreadState **tstate_p)
if (_PyStatus_EXCEPTION(status)) {
goto error;
}
config = &interp->config;

status = pycore_init_types(tstate);
if (_PyStatus_EXCEPTION(status)) {
goto error;
}

PyObject *sysmod;
status = _PySys_Create(tstate, &sysmod);
if (_PyStatus_EXCEPTION(status)) {
return status;
}

status = pycore_init_builtins(tstate);
if (_PyStatus_EXCEPTION(status)) {
goto error;
}

status = pycore_init_import_warnings(tstate, sysmod);
status = pycore_interp_init(tstate);
if (_PyStatus_EXCEPTION(status)) {
goto error;
}
Expand Down