Skip to content

[3.7] bpo-34247: Fix Python 3.7 initialization #8659

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 5 commits into from
Aug 5, 2018
Merged

[3.7] bpo-34247: Fix Python 3.7 initialization #8659

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
463792e
bpo-34247: Fix Python initialization
vstinner Aug 2, 2018
249aba7
Fix compilation on Windows
vstinner Aug 3, 2018
1533c6e
Cannot test _Py_CheckHashBasedPycsMode
vstinner Aug 3, 2018
e219dca
Fix _freeze_importlib.c
vstinner Aug 3, 2018
6c3b5ec
Add NEWS entry for bpo-34247 fix
vstinner Aug 4, 2018
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
Prev Previous commit
Next Next commit
Fix _freeze_importlib.c 
Replace _Py_InitializeEx_Private() with _Py_InitializeFromConfig().

The _Py_InitializeEx_Private() function has been removed.
  • Loading branch information
@vstinner
vstinner committed Aug 3, 2018
commit e219dca7993f9fde9a56754c2eab2463a3595494
1 change: 0 additions & 1 deletion Include/pylifecycle.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ PyAPI_FUNC(_PyInitError) _Py_InitializeMainInterpreter(
PyAPI_FUNC(void) Py_Initialize(void);
PyAPI_FUNC(void) Py_InitializeEx(int);
#ifndef Py_LIMITED_API
PyAPI_FUNC(_PyInitError) _Py_InitializeEx_Private(int, int);
PyAPI_FUNC(void) _Py_FatalInitError(_PyInitError err) _Py_NO_RETURN;
#endif
PyAPI_FUNC(void) Py_Finalize(void);
Expand Down
13 changes: 10 additions & 3 deletions Programs/_freeze_importlib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,18 +74,25 @@ main(int argc, char *argv[])
}
text[text_size] = '\0';

_PyCoreConfig config = _PyCoreConfig_INIT;
config.program_name = L"./_freeze_importlib";
/* Don't install importlib, since it could execute outdated bytecode. */
config._disable_importlib = 1;

Py_NoUserSiteDirectory++;
Py_NoSiteFlag++;
Py_IgnoreEnvironmentFlag++;
Py_FrozenFlag++;

Py_SetProgramName(L"./_freeze_importlib");
/* Don't install importlib, since it could execute outdated bytecode. */
_PyInitError err = _Py_InitializeEx_Private(1, 0);

_PyInitError err = _Py_InitializeFromConfig(&config);
/* No need to call _PyCoreConfig_Clear() since we didn't allocate any
memory: program_name is a constant string. */
if (_Py_INIT_FAILED(err)) {
_Py_FatalInitError(err);
}


if (strstr(inpath, "_external") != NULL) {
is_bootstrap = 0;
}
Expand Down