Skip to content
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
19 changes: 10 additions & 9 deletions Lib/subprocess.py
Original file line number Diff line number Diff line change
Expand Up @@ -351,15 +351,16 @@ def _args_from_interpreter_flags():
# -X options
if dev_mode:
args.extend(('-X', 'dev'))
for opt in ('faulthandler', 'tracemalloc', 'importtime',
'frozen_modules', 'showrefcount', 'utf8', 'gil'):
if opt in xoptions:
value = xoptions[opt]
if value is True:
arg = opt
else:
arg = '%s=%s' % (opt, value)
args.extend(('-X', arg))
for opt in sorted(xoptions):
if opt == 'dev':
# handled above via sys.flags.dev_mode
continue
value = xoptions[opt]
if value is True:
arg = opt
else:
arg = '%s=%s' % (opt, value)
args.extend(('-X', arg))

return args

Expand Down
7 changes: 7 additions & 0 deletions Lib/test/test_support.py
Original file line number Diff line number Diff line change
Expand Up @@ -569,12 +569,19 @@ def test_args_from_interpreter_flags(self):
# -X options
['-X', 'dev'],
['-Wignore', '-X', 'dev'],
['-X', 'cpu_count=4'],
['-X', 'disable-remote-debug'],
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is documented as

-X disable_remote_debug

with underscores.

Furthermore, -X presite=package.module, -X gil=0,1 and some more aren't listed here.

Not a big issue IMHO, since this just tests that whatever we pass in is returned from args_from_interpreter_flags?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So an alternative fix for #146580 would be to just remove ['-X', 'pycache_prefix=/tmp/pycache'],?

Sorry, didn't realize earlier, just stumbled over it now ...

['-X', 'faulthandler'],
['-X', 'importtime'],
['-X', 'importtime=2'],
['-X', 'int_max_str_digits=1000'],
['-X', 'lazy_imports=all'],
['-X', 'no_debug_ranges'],
['-X', 'pycache_prefix=/tmp/pycache'],
['-X', 'showrefcount'],
['-X', 'tracemalloc'],
['-X', 'tracemalloc=3'],
['-X', 'warn_default_encoding'],
):
with self.subTest(opts=opts):
self.check_options(opts, 'args_from_interpreter_flags')
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
All :option:`-X` options from the Python command line are now propagated to
child processes spawned by :mod:`multiprocessing`, not just a hard-coded
subset. This makes the behavior consistent between default "spawn" and
"forkserver" start methods and the old "fork" start method. The options
that were previously not propagated are: ``context_aware_warnings``,
``cpu_count``, ``disable-remote-debug``, ``int_max_str_digits``,
``lazy_imports``, ``no_debug_ranges``, ``pathconfig_warnings``, ``perf``,
``perf_jit``, ``presite``, ``pycache_prefix``, ``thread_inherit_context``,
and ``warn_default_encoding``.
Loading