Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 23, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions Lib/subprocess.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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
Expand Down
10 changes: 8 additions & 2 deletions Lib/test/test_support.py
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ def test_reap_children(self):
# 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()
Expand All @@ -466,7 +466,9 @@ def check_options(self, args, func):
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):
Expand All @@ -482,6 +484,7 @@ def test_args_from_interpreter_flags(self):
['-v'],
['-b'],
['-q'],
['-I'],
# same option multiple times
['-bb'],
['-vvv'],
Expand All @@ -500,6 +503,9 @@ def test_args_from_interpreter_flags(self):
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 (
Expand Down
Original file line number Diff line number Diff line change
@@ -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.