Skip to content

[WIP] bpo-36142: Rework Python init to add _PyPreConfig #12087

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

Closed
vstinner wants to merge 6 commits into from
Closed

[WIP] bpo-36142: Rework Python init to add _PyPreConfig #12087

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
111371d
bpo-36142: Rework Python init to add _PyPreConfig
vstinner Feb 22, 2019
d94fd28
Fix sys__enablelegacywindowsfsencoding_impl()
vstinner Mar 1, 2019
02a79a9
Fix _PyPreConfig_WINDOWS_INIT
vstinner Mar 1, 2019
a8fb926
Fix _freeze_importlib.c
vstinner Mar 1, 2019
326ea5c
Fix get_env_flag()
vstinner Mar 1, 2019
1eaeb4d
rename to _PyPreConfig_GetEnvFlag()
vstinner Mar 1, 2019
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
rename to _PyPreConfig_GetEnvFlag()
  • Loading branch information
@vstinner
vstinner committed Mar 1, 2019
commit 1eaeb4d5ae9cef53ca1e7e7ec80004a10cd54819
2 changes: 1 addition & 1 deletion Include/internal/pycore_coreconfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ PyAPI_FUNC(void) _PyPreConfig_GetGlobalConfig(_PyPreConfig *config);
PyAPI_FUNC(void) _PyPreConfig_SetGlobalConfig(const _PyPreConfig *config);
PyAPI_FUNC(_PyInitError) _PyPreConfig_InitFromArgv(_PyPreConfig *config, const _PyArgv *args);
PyAPI_FUNC(_PyInitError) _PyPreConfig_SetAllocator(_PyPreConfig *config);
PyAPI_FUNC(void) _PreConfig_GetEnvFlag(_PyPreConfig *config, int *flag, const char *name);
PyAPI_FUNC(void) _PyPreConfig_GetEnvFlag(_PyPreConfig *config, int *flag, const char *name);

/* _PyCoreConfig */
PyAPI_FUNC(_PyInitError) _PyCoreConfig_Read(_PyCoreConfig *config, const _PyPreConfig *preconfig);
Expand Down
14 changes: 7 additions & 7 deletions Python/coreconfig.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -730,25 +730,25 @@ config_read_env_vars(_PyCoreConfig *config)
_PyPreConfig *preconfig = &config->preconfig;

/* Get environment variables */
_PreConfig_GetEnvFlag(preconfig, &config->parser_debug, "PYTHONDEBUG");
_PreConfig_GetEnvFlag(preconfig, &config->verbose, "PYTHONVERBOSE");
_PreConfig_GetEnvFlag(preconfig, &config->optimization_level, "PYTHONOPTIMIZE");
_PreConfig_GetEnvFlag(preconfig, &config->inspect, "PYTHONINSPECT");
_PyPreConfig_GetEnvFlag(preconfig, &config->parser_debug, "PYTHONDEBUG");
_PyPreConfig_GetEnvFlag(preconfig, &config->verbose, "PYTHONVERBOSE");
_PyPreConfig_GetEnvFlag(preconfig, &config->optimization_level, "PYTHONOPTIMIZE");
_PyPreConfig_GetEnvFlag(preconfig, &config->inspect, "PYTHONINSPECT");

int dont_write_bytecode = 0;
_PreConfig_GetEnvFlag(preconfig, &dont_write_bytecode, "PYTHONDONTWRITEBYTECODE");
_PyPreConfig_GetEnvFlag(preconfig, &dont_write_bytecode, "PYTHONDONTWRITEBYTECODE");
if (dont_write_bytecode) {
config->write_bytecode = 0;
}

int no_user_site_directory = 0;
_PreConfig_GetEnvFlag(preconfig, &no_user_site_directory, "PYTHONNOUSERSITE");
_PyPreConfig_GetEnvFlag(preconfig, &no_user_site_directory, "PYTHONNOUSERSITE");
if (no_user_site_directory) {
config->user_site_directory = 0;
}

int unbuffered_stdio = 0;
_PreConfig_GetEnvFlag(preconfig, &unbuffered_stdio, "PYTHONUNBUFFERED");
_PyPreConfig_GetEnvFlag(preconfig, &unbuffered_stdio, "PYTHONUNBUFFERED");
if (unbuffered_stdio) {
config->buffered_stdio = 0;
}
Expand Down
6 changes: 3 additions & 3 deletions Python/preconfig.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,7 @@ preconfig_init_stdio_encoding(_PyPreConfig *config)


void
_PreConfig_GetEnvFlag(_PyPreConfig *config, int *flag, const char *name)
_PyPreConfig_GetEnvFlag(_PyPreConfig *config, int *flag, const char *name)
{
const char *var = _PyPreConfig_GetEnv(config, name);
if (!var) {
Expand Down Expand Up @@ -740,9 +740,9 @@ preconfig_read_env_vars(_PyPreConfig *config)
}

#ifdef MS_WINDOWS
_PreConfig_GetEnvFlag(config, &config->legacy_windows_fs_encoding,
_PyPreConfig_GetEnvFlag(config, &config->legacy_windows_fs_encoding,
"PYTHONLEGACYWINDOWSFSENCODING");
_PreConfig_GetEnvFlag(config, &config->legacy_windows_stdio,
_PyPreConfig_GetEnvFlag(config, &config->legacy_windows_stdio,
"PYTHONLEGACYWINDOWSSTDIO");
#endif

Expand Down