summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Oudkerk <shibturn@gmail.com>2012-08-01 16:44:18 (GMT)
committerRichard Oudkerk <shibturn@gmail.com>2012-08-01 16:44:18 (GMT)
commitb303580c7c9b1b5579ec6422773c2874d7a24274 (patch)
tree2c3d22e94f59b86039da8668149c4c807bc43b4d
parentc86e8d9c1734e91f86cd2731ad176042bc9e8987 (diff)
downloadcpython-b303580c7c9b1b5579ec6422773c2874d7a24274.zip
cpython-b303580c7c9b1b5579ec6422773c2874d7a24274.tar.gz
cpython-b303580c7c9b1b5579ec6422773c2874d7a24274.tar.bz2
Issue #15525: Increase timeout when TerminateProcess() fails
-rw-r--r--Lib/multiprocessing/forking.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/multiprocessing/forking.py b/Lib/multiprocessing/forking.py
index 4baf548..3beb816 100644
--- a/Lib/multiprocessing/forking.py
+++ b/Lib/multiprocessing/forking.py
@@ -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
#