diff options
| author | brian.curtin <brian@python.org> | 2011-04-11 22:56:23 (GMT) |
|---|---|---|
| committer | brian.curtin <brian@python.org> | 2011-04-11 22:56:23 (GMT) |
| commit | e2f299845d51beabec4563fb3ceeae3df63ae4b7 (patch) | |
| tree | f8769bffae9afbe1ddd73846863eb3d962c35519 /Lib/multiprocessing | |
| parent | 45e47e58edf101e7865d4bdaa2261ce1421a4209 (diff) | |
| download | cpython-e2f299845d51beabec4563fb3ceeae3df63ae4b7.zip cpython-e2f299845d51beabec4563fb3ceeae3df63ae4b7.tar.gz cpython-e2f299845d51beabec4563fb3ceeae3df63ae4b7.tar.bz2 | |
Fix #5162. Allow child spawning from Windows services (via pywin32).
Diffstat (limited to 'Lib/multiprocessing')
| -rw-r--r-- | Lib/multiprocessing/forking.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Lib/multiprocessing/forking.py b/Lib/multiprocessing/forking.py index d2a3208..0300a4b 100644 --- a/Lib/multiprocessing/forking.py +++ b/Lib/multiprocessing/forking.py @@ -195,6 +195,7 @@ else: TERMINATE = 0x10000 WINEXE = (sys.platform == 'win32' and getattr(sys, 'frozen', False)) + WINSERVICE = sys.executable.lower().endswith("pythonservice.exe") exit = win32.ExitProcess close = win32.CloseHandle @@ -204,7 +205,7 @@ else: # People embedding Python want to modify it. # - if sys.executable.lower().endswith('pythonservice.exe'): + if WINSERVICE: _python_exe = os.path.join(sys.exec_prefix, 'python.exe') else: _python_exe = sys.executable @@ -394,7 +395,7 @@ else: if _logger is not None: d['log_level'] = _logger.getEffectiveLevel() - if not WINEXE: + if not WINEXE and not WINSERVICE: main_path = getattr(sys.modules['__main__'], '__file__', None) if not main_path and sys.argv[0] not in ('', '-c'): main_path = sys.argv[0] |