[Python-checkins] cpython (3.4): #23925: stop (eg) PYTHONSTARTUP from causing test_cmd_line failure.

r.david.murray python-checkins at python.org
Tue Apr 14 23:58:58 CEST 2015


https://hg.python.org/cpython/rev/d0819a8fda1b
changeset:   95663:d0819a8fda1b
branch:      3.4
parent:      95660:08400c64af93
user:        R David Murray <rdmurray at bitdance.com>
date:        Tue Apr 14 17:57:41 2015 -0400
summary:
  #23925: stop (eg) PYTHONSTARTUP from causing test_cmd_line failure.

Patch by Jamiel Almeida.

files:
  Lib/test/test_cmd_line.py |  6 +++++-
  1 files changed, 5 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
--- a/Lib/test/test_cmd_line.py
+++ b/Lib/test/test_cmd_line.py
@@ -271,7 +271,11 @@
 
     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'],

-- 
Repository URL: https://hg.python.org/cpython


More information about the Python-checkins mailing list