commit | b303580c7c9b1b5579ec6422773c2874d7a24274 | [log] [tgz] |
---|---|---|
author | Richard Oudkerk <shibturn@gmail.com> | Wed Aug 01 17:44:18 2012 +0100 |
committer | Richard Oudkerk <shibturn@gmail.com> | Wed Aug 01 17:44:18 2012 +0100 |
tree | 2c3d22e94f59b86039da8668149c4c807bc43b4d | |
parent | c86e8d9c1734e91f86cd2731ad176042bc9e8987 [diff] [blame] |
Issue #15525: Increase timeout when TerminateProcess() fails
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 @@ 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 #