mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-08 03:45:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-36301: Add _Py_GetEnv() function (GH-12542)

Browse source 
* Make _PyPreConfig_GetEnv(), _PyCoreConfig_GetEnv() and
  _PyCoreConfig_GetEnvDup() private
* _Py_get_env_flag() first parameter becomes "int use_environment"
This commit is contained in:
Victor Stinner 2019-03-26 00:03:15 +01:00 • committed by GitHub
parent 548cb6060a
commit f78a5e9ce8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 34 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Python/preconfig.c
View file

@ -270,11 +270,11 @@ _PyPreConfig_SetGlobalConfig(const _PyPreConfig *config)
const char*
_PyPreConfig_GetEnv(const _PyPreConfig *config, const char *name)
_Py_GetEnv(int use_environment, const char *name)
{
assert(config->use_environment >= 0);
assert(use_environment >= 0);
if (!config->use_environment) {
if (!use_environment) {
return NULL;
}
@ -288,6 +288,13 @@ _PyPreConfig_GetEnv(const _PyPreConfig *config, const char *name)
}
static const char*
_PyPreConfig_GetEnv(const _PyPreConfig *config, const char *name)
{
return _Py_GetEnv(config->use_environment, name);
}
int
_Py_str_to_int(const char *str, int *result)
{
@ -307,9 +314,9 @@ _Py_str_to_int(const char *str, int *result)
void
_Py_get_env_flag(_PyPreConfig *config, int *flag, const char *name)
_Py_get_env_flag(int use_environment, int *flag, const char *name)
{
const char *var = _PyPreConfig_GetEnv(config, name);
const char *var = _Py_GetEnv(use_environment, name);
if (!var) {
return;
}
@ -434,8 +441,9 @@ preconfig_read(_PyPreConfig *config, _PyPreCmdline *cmdline)
/* legacy_windows_fs_encoding, utf8_mode, coerce_c_locale */
if (config->use_environment) {
#ifdef MS_WINDOWS
_Py_get_env_flag(config, &config->legacy_windows_fs_encoding,
"PYTHONLEGACYWINDOWSFSENCODING");
_Py_get_env_flag(config->use_environment,
&config->legacy_windows_fs_encoding,
"PYTHONLEGACYWINDOWSFSENCODING");
#endif
const char *env = _PyPreConfig_GetEnv(config, "PYTHONCOERCECLOCALE");