Skip to content
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.

Sign up for GitHub

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

gh-117378: Fix multiprocessing forkserver preload sys.path inheritance. #126538

Merged
merged 7 commits into from
Nov 9, 2024
Merged

gh-117378: Fix multiprocessing forkserver preload sys.path inheritance. #126538

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c40b26d
gh-117378: Fix multiprocessing forkserver preload sys.path inheritance.
gpshead Nov 7, 2024
702e0b7
NEWS entry
gpshead Nov 7, 2024
7ad114f
move sys.path setting up per review.
gpshead Nov 8, 2024
cf07467
Redo the test as an sys.path integration test.
gpshead Nov 9, 2024
4fe3389
avoid := for readability
gpshead Nov 9, 2024
3f486f8
reword NEWS
gpshead Nov 9, 2024
2444519
news sphinx-lint fix
gpshead Nov 9, 2024
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
Prev Previous commit
Next Next commit
move sys.path setting up per review.
  • Loading branch information
@gpshead
gpshead committed Nov 8, 2024
commit 7ad114f986e6e1f483d952c099d753c9af6b5d69
4 changes: 2 additions & 2 deletions Lib/multiprocessing/forkserver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,14 +168,14 @@ def ensure_running(self):
def main(listener_fd, alive_r, preload, main_path=None, sys_path=None):
'''Run forkserver.'''
if preload:
if sys_path is not None:
sys.path[:] = sys_path
if '__main__' in preload and main_path is not None:
process.current_process()._inheriting = True
try:
spawn.import_main_path(main_path)
finally:
del process.current_process()._inheriting
if sys_path is not None:
sys.path[:] = sys_path
for modname in preload:
try:
__import__(modname)
Expand Down
Loading