]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
bpo-40939: Remove some extra references to PYTHONOLDPARSER (GH-20815)
authorPablo Galindo <Pablogsal@gmail.com>
Thu, 11 Jun 2020 17:08:05 +0000 (18:08 +0100)
committerGitHub <noreply@github.com>
Thu, 11 Jun 2020 17:08:05 +0000 (10:08 -0700)
Automerge-Triggered-By: @pablogsal
Programs/_testembed.c
Tools/scripts/run_tests.py

index 6f38b6247fb898d15808400c6dbe2f5816317a8b..b60d70be5f71e69f2e29d8f9ef02e1e2f4109c73 100644 (file)
@@ -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");
 }
 
index bcfa5e943b347d59c035278b1c473eb37bc7a96d..48feb3f778ee8dfd0edc502f71bd7d9d8b148996 100644 (file)
@@ -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())