Merge pull request gitpython-developers#372 from AardmanCGI/win_sigkill_fix

Byron · Byron · commit 3fe8f5df5794 · 2015-12-21T12:06:32.000+01:00
Fixed a non-Windows import
diff --git a/git/cmd.py b/git/cmd.py
@@ -14,7 +14,7 @@
 import mmap
 
 from contextlib import contextmanager
-from signal import SIGKILL
+import signal
 from subprocess import (
     call,
     Popen,
@@ -617,10 +617,12 @@ def _kill_process(pid):
                     if local_pid.isdigit():
                         child_pids.append(int(local_pid))
             try:
-                os.kill(pid, SIGKILL)
+                # Windows does not have SIGKILL, so use SIGTERM instead
+                sig = getattr(signal, 'SIGKILL', signal.SIGTERM)
+                os.kill(pid, sig)
                 for child_pid in child_pids:
                     try:
-                        os.kill(child_pid, SIGKILL)
+                        os.kill(child_pid, sig)
                     except OSError:
                         pass
                 kill_check.set()    # tell the main routine that the process was killed
