]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
#23925: stop (eg) PYTHONSTARTUP from causing test_cmd_line failure.
authorR David Murray <rdmurray@bitdance.com>
Tue, 14 Apr 2015 21:57:41 +0000 (17:57 -0400)
committerR David Murray <rdmurray@bitdance.com>
Tue, 14 Apr 2015 21:57:41 +0000 (17:57 -0400)
Patch by Jamiel Almeida.

Lib/test/test_cmd_line.py

index 3683a48b7adcdc9e3c3ff432db919ed31cd0e751..cb9bbddc8c62c4d3ddb8aefbb32df421dae2fe81 100644 (file)
@@ -271,7 +271,11 @@ class CmdLineTest(unittest.TestCase):
 
     def test_displayhook_unencodable(self):
         for encoding in ('ascii', 'latin-1', 'utf-8'):
-            env = os.environ.copy()
+            # We are testing a PYTHON environment variable here, so we can't
+            # use -E, -I, or script_helper (which uses them).  So instead we do
+            # poor-man's isolation by deleting the PYTHON vars from env.
+            env = {key:value for (key,value) in os.environ.copy().items()
+                   if not key.startswith('PYTHON')}
             env['PYTHONIOENCODING'] = encoding
             p = subprocess.Popen(
                 [sys.executable, '-i'],