[Python-checkins] cpython (merge default -> default): Merge heads.

[r.david.murray]

http://hg.python.org/cpython/rev/3ee046d44287
changeset:   68755:3ee046d44287
parent:      68754:2a8580f4897c
parent:      68750:6017c431ff0d
user:        R David Murray <rdmurray at bitdance.com>
date:        Sun Mar 20 11:37:13 2011 -0400
summary:
  Merge heads.

files:
  

diff --git a/Lib/subprocess.py b/Lib/subprocess.py
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -1113,11 +1113,11 @@
             if self.stdout is not None:
                 self.stdout_thread.join(self._remaining_time(endtime))
                 if self.stdout_thread.isAlive():
-                    raise TimeoutExpired(self.args)
+                    raise TimeoutExpired(self.args, orig_timeout)
             if self.stderr is not None:
                 self.stderr_thread.join(self._remaining_time(endtime))
                 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
             # both have been read successfully.

-- 
Repository URL: http://hg.python.org/cpython