traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix #5162. Allow child spawning from Windows services (via pywin32).

This commit is contained in:
brian.curtin 2011-04-11 18:00:59 -05:00
parent e575f10c51
commit 40b5316118
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Lib/multiprocessing/forking.py
View File

@ -198,6 +198,7 @@ else:
TERMINATE = 0x10000 TERMINATE = 0x10000
WINEXE = (sys.platform == 'win32' and getattr(sys, 'frozen', False)) WINEXE = (sys.platform == 'win32' and getattr(sys, 'frozen', False))
WINSERVICE = sys.executable.lower().endswith("pythonservice.exe")
exit = win32.ExitProcess exit = win32.ExitProcess
close = win32.CloseHandle close = win32.CloseHandle
@ -207,7 +208,7 @@ else:
# People embedding Python want to modify it. # 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') _python_exe = os.path.join(sys.exec_prefix, 'python.exe')
else: else:
_python_exe = sys.executable _python_exe = sys.executable
@ -397,7 +398,7 @@ else:
if _logger is not None: if _logger is not None:
d['log_level'] = _logger.getEffectiveLevel() d['log_level'] = _logger.getEffectiveLevel()
if not WINEXE: if not WINEXE and not WINSERVICE:
main_path = getattr(sys.modules['__main__'], '__file__', None) main_path = getattr(sys.modules['__main__'], '__file__', None)
if not main_path and sys.argv[0] not in ('', '-c'): if not main_path and sys.argv[0] not in ('', '-c'):
main_path = sys.argv[0] main_path = sys.argv[0]