From f78a5e9ce8f32a195f5f788aade79578437f30a6 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Tue, 26 Mar 2019 00:03:15 +0100 Subject: bpo-36301: Add _Py_GetEnv() function (GH-12542) * Make _PyPreConfig_GetEnv(), _PyCoreConfig_GetEnv() and _PyCoreConfig_GetEnvDup() private * _Py_get_env_flag() first parameter becomes "int use_environment" --- Modules/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Modules/main.c') diff --git a/Modules/main.c b/Modules/main.c index 197c9b39eb..46bc72af46 100644 --- a/Modules/main.c +++ b/Modules/main.c @@ -655,7 +655,7 @@ pymain_run_file(_PyCoreConfig *config, PyCompilerFlags *cf) static void pymain_run_startup(_PyCoreConfig *config, PyCompilerFlags *cf) { - const char *startup = _PyCoreConfig_GetEnv(config, "PYTHONSTARTUP"); + const char *startup = _Py_GetEnv(config->preconfig.use_environment, "PYTHONSTARTUP"); if (startup == NULL) { return; } @@ -735,7 +735,7 @@ pymain_repl(_PyCoreConfig *config, PyCompilerFlags *cf, int *exitcode) { /* Check this environment variable at the end, to give programs the opportunity to set it from Python. */ - if (!Py_InspectFlag && _PyCoreConfig_GetEnv(config, "PYTHONINSPECT")) { + if (!Py_InspectFlag && _Py_GetEnv(config->preconfig.use_environment, "PYTHONINSPECT")) { Py_InspectFlag = 1; config->inspect = 1; } -- cgit v1.2.1