mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Fix timeout error message on windows to not be in milliseconds.

Browse source
This commit is contained in:
Reid Kleckner 2011-03-21 10:06:10 -07:00
parent 0fd59acc70
commit 91156ff3f1
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Lib/subprocess.py
View file

@ -1068,11 +1068,12 @@ class Popen(object):
if endtime is not None: if endtime is not None:
timeout = self._remaining_time(endtime) timeout = self._remaining_time(endtime)
if timeout is None: if timeout is None:
timeout = _subprocess.INFINITE timeout_millis = _subprocess.INFINITE
else: else:
timeout = int(timeout * 1000) timeout_millis = int(timeout * 1000)
if self.returncode is None: if self.returncode is None:
result = _subprocess.WaitForSingleObject(self._handle, timeout) result = _subprocess.WaitForSingleObject(self._handle,
timeout_millis)
if result == _subprocess.WAIT_TIMEOUT: if result == _subprocess.WAIT_TIMEOUT:
raise TimeoutExpired(self.args, timeout) raise TimeoutExpired(self.args, timeout)
self.returncode = _subprocess.GetExitCodeProcess(self._handle) self.returncode = _subprocess.GetExitCodeProcess(self._handle)