From 436b648910c27baf8164a6d46d746d36d8a93478 Mon Sep 17 00:00:00 2001 From: Pablo Galindo Date: Thu, 11 Jun 2020 18:08:05 +0100 Subject: [PATCH] bpo-40939: Remove some extra references to PYTHONOLDPARSER (GH-20815) Automerge-Triggered-By: @pablogsal --- Programs/_testembed.c | 3 --- Tools/scripts/run_tests.py | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Programs/_testembed.c b/Programs/_testembed.c index 6f38b6247fb..b60d70be5f7 100644 --- a/Programs/_testembed.c +++ b/Programs/_testembed.c @@ -485,8 +485,6 @@ static int test_init_from_config(void) config.install_signal_handlers = 0; - putenv("PYTHONOLDPARSER=1"); - /* FIXME: test use_environment */ putenv("PYTHONHASHSEED=42"); @@ -673,7 +671,6 @@ static void set_most_env_vars(void) putenv("PYTHONNOUSERSITE=1"); putenv("PYTHONFAULTHANDLER=1"); putenv("PYTHONIOENCODING=iso8859-1:replace"); - putenv("PYTHONOLDPARSER=1"); putenv("PYTHONPLATLIBDIR=env_platlibdir"); } diff --git a/Tools/scripts/run_tests.py b/Tools/scripts/run_tests.py index bcfa5e943b3..48feb3f778e 100644 --- a/Tools/scripts/run_tests.py +++ b/Tools/scripts/run_tests.py @@ -25,9 +25,8 @@ def main(regrtest_args): '-u', # Unbuffered stdout and stderr '-W', 'default', # Warnings set to 'default' '-bb', # Warnings about bytes/bytearray + '-E', # Ignore environment variables ] - if 'PYTHONOLDPARSER' not in os.environ: - args.append('-E') # Ignore environment variables # Allow user-specified interpreter options to override our defaults. args.extend(test.support.args_from_interpreter_flags())