From: brian.curtin <brian@python.org>
Date: Mon, 11 Apr 2011 22:56:23 +0000 (-0500)
Subject: Fix #5162. Allow child spawning from Windows services (via pywin32).
X-Git-Tag: v3.2.1b1~150^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e2f299845d51beabec4563fb3ceeae3df63ae4b7;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Lib/multiprocessing/forking.py b/Lib/multiprocessing/forking.py
index d2a320845365..0300a4b8c299 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]