Use CreateProcess from _subprocess on Python 2.7. Closes celery/celer…

…y#3414
celery · Aug 30, 2016 · 2f28ead · 2f28ead
1 parent 5d17801
commit 2f28ead
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/billiard/popen_spawn_win32.py b/billiard/popen_spawn_win32.py
@@ -28,6 +28,13 @@
 #
 
 
+if sys.platform == 'win32':
+    try:
+        from _winapi import CreateProcess
+    except ImportError:  # Py2.7
+        from _subprocess import CreateProcess
+
+
 class Popen(object):
     '''
     Start a subprocess to run the code of a process object
@@ -51,7 +58,7 @@ def __init__(self, process_obj):
         with io.open(wfd, 'wb', closefd=True) as to_child:
             # start process
             try:
-                hp, ht, pid, tid = _winapi.CreateProcess(
+                hp, ht, pid, tid = CreateProcess(
                     spawn.get_executable(), cmd,
                     None, None, False, 0, None, None, None)
                 _winapi.CloseHandle(ht)

diff --git a/t/unit/test_win32.py b/t/unit/test_win32.py
@@ -65,7 +65,6 @@ def test_constants(self, name):
         'TerminateProcess',
         'DuplicateHandle',
         'CreatePipe',
-        'CreateProcess',
     ])
     def test_functions(self, name):
         assert getattr(_winapi, name)