diff options
| author |   Victor Stinner <vstinner@redhat.com> | 2019-05-02 15:30:21 -0400 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2019-05-02 15:30:21 -0400 |
| commit | 4631da1242fc96002a3c0462a87d087e567368aa (patch) | |
| tree | 217203b1293ecc7ac92679c9da38338f1a0c3f1f /Programs | |
| parent | bpo-36763: _PyCoreConfig_SetPyArgv() preinitializes Python (GH-13037) (diff) | |
| download | cpython-4631da1242fc96002a3c0462a87d087e567368aa.tar.gz cpython-4631da1242fc96002a3c0462a87d087e567368aa.tar.bz2 cpython-4631da1242fc96002a3c0462a87d087e567368aa.zip | |
bpo-36763: Remove _PyCoreConfig._init_main (GH-13066)
Diffstat (limited to 'Programs')
| -rw-r--r-- | Programs/_freeze_importlib.c | 1 | ||||
| -rw-r--r-- | Programs/_testembed.c | 5 |
2 files changed, 0 insertions, 6 deletions
diff --git a/Programs/_freeze_importlib.c b/Programs/_freeze_importlib.c index 6f77e86a9e..0818012d8c 100644 --- a/Programs/_freeze_importlib.c +++ b/Programs/_freeze_importlib.c @@ -84,7 +84,6 @@ main(int argc, char *argv[]) /* Don't install importlib, since it could execute outdated bytecode. */ config._install_importlib = 0; config._frozen = 1; - config._init_main = 0; _PyInitError err = _Py_InitializeFromConfig(&config); /* No need to call _PyCoreConfig_Clear() since we didn't allocate any diff --git a/Programs/_testembed.c b/Programs/_testembed.c index 2cadf82cb1..b12594799b 100644 --- a/Programs/_testembed.c +++ b/Programs/_testembed.c @@ -354,8 +354,6 @@ static int test_init_global_config(void) putenv("PYTHONUNBUFFERED="); Py_UnbufferedStdioFlag = 1; - Py_FrozenFlag = 1; - /* FIXME: test Py_LegacyWindowsFSEncodingFlag */ /* FIXME: test Py_LegacyWindowsStdioFlag */ @@ -497,9 +495,6 @@ static int test_init_from_config(void) config.check_hash_pycs_mode = L"always"; - Py_FrozenFlag = 0; - config._frozen = 1; - err = _Py_InitializeFromConfig(&config); if (_Py_INIT_FAILED(err)) { _Py_ExitInitError(err); |