Make the stdlib test suite helper test.script_helper._assert_python no longer

pass -I or -E to the child process by default when the environment is required
for the child process interpreter to function properly.
This commit is contained in:
Gregory P. Smith 2015-02-04 17:10:19 -08:00
parent 6a1b004b83
commit c3493aa951
2 changed files with 36 additions and 2 deletions

View file

@ -52,16 +52,17 @@ def _interpreter_requires_environment():
# Executing the interpreter in a subprocess
def _assert_python(expected_success, *args, **env_vars):
env_required = _interpreter_requires_environment()
if '__isolated' in env_vars:
isolated = env_vars.pop('__isolated')
else:
isolated = not env_vars
isolated = not env_vars and not env_required
cmd_line = [sys.executable, '-X', 'faulthandler']
if isolated:
# isolated mode: ignore Python environment variables, ignore user
# site-packages, and don't add the current directory to sys.path
cmd_line.append('-I')
elif not env_vars:
elif not env_vars and not env_required:
# ignore Python environment variables
cmd_line.append('-E')
# Need to preserve the original environment, for in-place testing of