]> granicus.if.org Git - python/commitdiff
Issue #15525: Increase timeout when TerminateProcess() fails
authorRichard Oudkerk <shibturn@gmail.com>
Wed, 1 Aug 2012 16:44:18 +0000 (17:44 +0100)
committerRichard Oudkerk <shibturn@gmail.com>
Wed, 1 Aug 2012 16:44:18 +0000 (17:44 +0100)
Lib/multiprocessing/forking.py

index 4baf5486c0f3b05794d97b655e9521fbe3fbb4d0..3beb81659354d36f42a737afc5f10712c39125b4 100644 (file)
@@ -273,8 +273,8 @@ else:
             if self.returncode is None:
                 try:
                     _winapi.TerminateProcess(int(self._handle), TERMINATE)
-                except WindowsError:
-                    if self.wait(timeout=0.1) is None:
+                except OSError:
+                    if self.wait(timeout=1.0) is None:
                         raise
 
     #