critical bug fix for non-windows systems

filebottool/killableprocess.py

@@ -135,7 +135,7 @@ def _execute_child_27(self, args, executable, preexec_fn, close_fds,
                 args = comspec + " /c " + args
 
             # We create a new job for this process, so that we can kill
-            # the process and any sub-processes 
+            # the process and any sub-processes
             self._job = winprocess.CreateJobObject()
 
             creationflags |= winprocess.CREATE_SUSPENDED
@@ -172,10 +172,10 @@ def _close_in_parent(fd):
             winprocess.ResumeThread(ht)
 
 
-    def _execute_child(self, *args):
-        if sys.version_info[:2] == (2, 6):
-            args = args[:10] + ([],) + args[10:]
-        return self._execute_child_27(*args)
+        def _execute_child(self, *args):
+            if sys.version_info[:2] == (2, 6):
+                args = args[:10] + ([],) + args[10:]
+            return self._execute_child_27(*args)
 
     def kill(self, group=True):
         """Kill the process. If group=True, all sub-processes will also be killed."""
@@ -184,7 +184,7 @@ def kill(self, group=True):
                 winprocess.TerminateJobObject(self._job, 127)
             else:
                 winprocess.TerminateProcess(self._handle, 127)
-            self.returncode = 127    
+            self.returncode = 127
         else:
             if group:
                 os.killpg(self.pid, signal.SIGKILL)
@@ -213,7 +213,7 @@ def wait(self, timeout=-1, group=True):
             if timeout == -1:
                 subprocess.Popen.wait(self)
                 return self.returncode
-            
+
             starttime = time.time()
 
             # Make sure there is a signal handler for SIGCHLD installed
@@ -225,7 +225,7 @@ def wait(self, timeout=-1, group=True):
                     self._handle_exitstatus(sts)
                     signal.signal(signal.SIGCHLD, oldsignal)
                     return self.returncode
-                
+
                 # time.sleep is interrupted by signals (good!)
                 newtimeout = timeout - time.time() + starttime
                 time.sleep(newtimeout)