From 793ee1f8a826d93b1f0243644fbf2b1b185eb96b Mon Sep 17 00:00:00 2001 From: Nick Coghlan Date: Sun, 30 Jan 2011 01:24:08 +0000 Subject: [PATCH] Issue #10845: Improve compatibility between multiprocessing on Windows and package, zipfile and directory execution (Reviewed by Antoine Pitrou and approved by Georg Brandl) --- Lib/multiprocessing/forking.py | 10 +++++++++- Misc/NEWS | 4 ++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Lib/multiprocessing/forking.py b/Lib/multiprocessing/forking.py index d2a3208453..8ddddb60b5 100644 --- a/Lib/multiprocessing/forking.py +++ b/Lib/multiprocessing/forking.py @@ -459,12 +459,20 @@ def prepare(data): process.ORIGINAL_DIR = data['orig_dir'] if 'main_path' in data: + # XXX (ncoghlan): The following code makes several bogus + # assumptions regarding the relationship between __file__ + # and a module's real name. See PEP 302 and issue #10845 main_path = data['main_path'] main_name = os.path.splitext(os.path.basename(main_path))[0] if main_name == '__init__': main_name = os.path.basename(os.path.dirname(main_path)) - if main_name != 'ipython': + if main_name == '__main__': + main_module = sys.modules['__main__'] + main_module.__file__ = main_path + elif main_name != 'ipython': + # Main modules not actually called __main__.py may + # contain additional code that should still be executed import imp if main_path is None: diff --git a/Misc/NEWS b/Misc/NEWS index ed7e5de35f..57b2440eda 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -16,6 +16,10 @@ Core and Builtins Library ------- +- Issue #10845: Mitigate the incompatibility between the multiprocessing + module on Windows and the use of package, zipfile or directory execution + by special casing main modules that actually *are* called __main__.py. + - Issue #11045: Protect logging call against None argument. - Issue #11052: Correct IDLE menu accelerators on Mac OS X for Save -- 2.40.0