summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorVictor Stinner <vstinner@redhat.com>2019-05-02 19:30:21 (GMT)
committerGitHub <noreply@github.com>2019-05-02 19:30:21 (GMT)
commit4631da1242fc96002a3c0462a87d087e567368aa (patch)
tree217203b1293ecc7ac92679c9da38338f1a0c3f1f /Python
parent70005ac0fddd8585725b92acd1bc2b8e7b81999c (diff)
downloadcpython-4631da1242fc96002a3c0462a87d087e567368aa.zip
cpython-4631da1242fc96002a3c0462a87d087e567368aa.tar.gz
cpython-4631da1242fc96002a3c0462a87d087e567368aa.tar.bz2
bpo-36763: Remove _PyCoreConfig._init_main (GH-13066)
Diffstat (limited to 'Python')
-rw-r--r--Python/coreconfig.c2
-rw-r--r--Python/pylifecycle.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/Python/coreconfig.c b/Python/coreconfig.c
index 5202694..ac01712 100644
--- a/Python/coreconfig.c
+++ b/Python/coreconfig.c
@@ -667,7 +667,6 @@ _PyCoreConfig_Copy(_PyCoreConfig *config, const _PyCoreConfig *config2)
COPY_WSTR_ATTR(run_filename);
COPY_WSTR_ATTR(check_hash_pycs_mode);
COPY_ATTR(_frozen);
- COPY_ATTR(_init_main);
#undef COPY_ATTR
#undef COPY_WSTR_ATTR
@@ -766,7 +765,6 @@ _PyCoreConfig_AsDict(const _PyCoreConfig *config)
SET_ITEM_INT(_install_importlib);
SET_ITEM_WSTR(check_hash_pycs_mode);
SET_ITEM_INT(_frozen);
- SET_ITEM_INT(_init_main);
return dict;
diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
index 2ba43b9..bd4d1d9 100644
--- a/Python/pylifecycle.c
+++ b/Python/pylifecycle.c
@@ -988,7 +988,7 @@ init_python(const _PyCoreConfig *config, const _PyArgv *args)
}
config = &interp->core_config;
- if (config->_init_main) {
+ if (!config->_frozen) {
err = _Py_InitializeMainInterpreter(runtime, interp);
if (_Py_INIT_FAILED(err)) {
return err;