Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merge heads.

This commit is contained in:
R David Murray 2011-03-20 11:37:13 -04:00
parent 3d81d3e0d3 9a67e6c743
commit 3c8d0cc5e5
1 changed files with 2 additions and 2 deletions
Show Stats 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.