diff options
| author | R David Murray <rdmurray@bitdance.com> | 2015-04-14 21:57:41 (GMT) |
|---|---|---|
| committer | R David Murray <rdmurray@bitdance.com> | 2015-04-14 21:57:41 (GMT) |
| commit | f4bbc535b9f6fdd5f4c32e0e5518bea371dd51fa (patch) | |
| tree | b175547f8149bf9ea129158c8806dcf2f87e7829 | |
| parent | 50db6acc9b13188ea557070f63ca428eaf7cfc86 (diff) | |
| download | cpython-f4bbc535b9f6fdd5f4c32e0e5518bea371dd51fa.zip cpython-f4bbc535b9f6fdd5f4c32e0e5518bea371dd51fa.tar.gz cpython-f4bbc535b9f6fdd5f4c32e0e5518bea371dd51fa.tar.bz2 | |
#23925: stop (eg) PYTHONSTARTUP from causing test_cmd_line failure.
Patch by Jamiel Almeida.
| -rw-r--r-- | 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 index 3683a48..cb9bbdd 100644 --- a/Lib/test/test_cmd_line.py +++ b/Lib/test/test_cmd_line.py @@ -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'], |