bpo-34812: subprocess._args_from_interpreter_flags(): add isolated (GH-10675)

The "-I" command line option (run Python in isolated mode) is now
also copied by the multiprocessing and distutils modules when
spawning child processes. Previously, only -E and -s options (enabled
by -I) were copied.

subprocess._args_from_interpreter_flags() now copies the -I flag.
This commit is contained in:
Victor Stinner 2018-11-23 17:54:20 +01:00 committed by GitHub
parent ba57963a95
commit 9de3632715
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 4 deletions

View File

@ -262,9 +262,7 @@ def _args_from_interpreter_flags():
# 'inspect': 'i',
# 'interactive': 'i',
'dont_write_bytecode': 'B',
'no_user_site': 's',
'no_site': 'S',
'ignore_environment': 'E',
'verbose': 'v',
'bytes_warning': 'b',
'quiet': 'q',
@ -276,6 +274,14 @@ def _args_from_interpreter_flags():
if v > 0:
args.append('-' + opt * v)
if sys.flags.isolated:
args.append('-I')
else:
if sys.flags.ignore_environment:
args.append('-E')
if sys.flags.no_user_site:
args.append('-s')
# -W options
warnopts = sys.warnoptions[:]
bytes_warning = sys.flags.bytes_warning

View File

@ -456,7 +456,7 @@ class TestSupport(unittest.TestCase):
# pending child process
support.reap_children()
def check_options(self, args, func):
def check_options(self, args, func, expected=None):
code = f'from test.support import {func}; print(repr({func}()))'
cmd = [sys.executable, *args, '-c', code]
env = {key: value for key, value in os.environ.items()
@ -466,7 +466,9 @@ class TestSupport(unittest.TestCase):
stderr=subprocess.DEVNULL,
universal_newlines=True,
env=env)
self.assertEqual(proc.stdout.rstrip(), repr(args))
if expected is None:
expected = args
self.assertEqual(proc.stdout.rstrip(), repr(expected))
self.assertEqual(proc.returncode, 0)
def test_args_from_interpreter_flags(self):
@ -482,6 +484,7 @@ class TestSupport(unittest.TestCase):
['-v'],
['-b'],
['-q'],
['-I'],
# same option multiple times
['-bb'],
['-vvv'],
@ -500,6 +503,9 @@ class TestSupport(unittest.TestCase):
with self.subTest(opts=opts):
self.check_options(opts, 'args_from_interpreter_flags')
self.check_options(['-I', '-E', '-s'], 'args_from_interpreter_flags',
['-I'])
def test_optim_args_from_interpreter_flags(self):
# Test test.support.optim_args_from_interpreter_flags()
for opts in (

View File

@ -0,0 +1,4 @@
The :option:`-I` command line option (run Python in isolated mode) is now
also copied by the :mod:`multiprocessing` and :mod:`distutils` modules when
spawning child processes. Previously, only :option:`-E` and :option:`-s` options
(enabled by :option:`-I`) were copied.