From c96be811fa7da8ddcea18cc7abcae94e0f5ff966 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Tue, 14 May 2019 17:34:56 +0200 Subject: bpo-36900: Replace global conf vars with config (GH-13299) Replace global configuration variables with core_config read from the current interpreter. Cleanup dynload_hpux.c. --- Modules/main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Modules/main.c') diff --git a/Modules/main.c b/Modules/main.c index e117ef29e5..0f99e2af5d 100644 --- a/Modules/main.c +++ b/Modules/main.c @@ -403,8 +403,8 @@ static int pymain_run_stdin(_PyCoreConfig *config, PyCompilerFlags *cf) { if (stdin_is_interactive(config)) { - Py_InspectFlag = 0; /* do exit on SystemExit */ config->inspect = 0; + Py_InspectFlag = 0; /* do exit on SystemExit */ pymain_run_startup(config, cf); pymain_run_interactive_hook(); } @@ -425,17 +425,17 @@ 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 && _Py_GetEnv(config->use_environment, "PYTHONINSPECT")) { - Py_InspectFlag = 1; + if (!config->inspect && _Py_GetEnv(config->use_environment, "PYTHONINSPECT")) { config->inspect = 1; + Py_InspectFlag = 1; } - if (!(Py_InspectFlag && stdin_is_interactive(config) && RUN_CODE(config))) { + if (!(config->inspect && stdin_is_interactive(config) && RUN_CODE(config))) { return; } - Py_InspectFlag = 0; config->inspect = 0; + Py_InspectFlag = 0; pymain_run_interactive_hook(); int res = PyRun_AnyFileFlags(stdin, "", cf); -- cgit v1.2.1