mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-05 00:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Fix the Windows timeout code.

Browse source
This commit is contained in:
Reid Kleckner 2011-03-20 08:28:07 -07:00
parent 5b5394c6df
commit 9a67e6c743
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/subprocess.py
View file

@ -1113,11 +1113,11 @@ class Popen(object):
if self.stdout is not None: if self.stdout is not None:
self.stdout_thread.join(self._remaining_time(endtime)) self.stdout_thread.join(self._remaining_time(endtime))
if self.stdout_thread.isAlive(): if self.stdout_thread.isAlive():
raise TimeoutExpired(self.args) raise TimeoutExpired(self.args, orig_timeout)
if self.stderr is not None: if self.stderr is not None:
self.stderr_thread.join(self._remaining_time(endtime)) self.stderr_thread.join(self._remaining_time(endtime))
if self.stderr_thread.isAlive(): if self.stderr_thread.isAlive():
raise TimeoutExpired(self.args) raise TimeoutExpired(self.args, orig_timeout)
# Collect the output from and close both pipes, now that we know # Collect the output from and close both pipes, now that we know
# both have been read successfully. # both have been read successfully.