Merge: #23925: stop (eg) PYTHONSTARTUP from causing test_cmd_line failure.

This commit is contained in:
R David Murray 2015-04-14 17:58:40 -04:00
commit 687592def9
1 changed files with 5 additions and 1 deletions

View 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'],