diff options
| author | R David Murray <rdmurray@bitdance.com> | 2011-03-20 15:37:13 (GMT) |
|---|---|---|
| committer | R David Murray <rdmurray@bitdance.com> | 2011-03-20 15:37:13 (GMT) |
| commit | 3c8d0cc5e5c79bb9420a6c46a1ee7a52c089a253 (patch) | |
| tree | 473ae5269ba480dc8c9dd4aadd5d2f753a15c45e | |
| parent | 3d81d3e0d3dc234edb71ea1bb47b3c7cb7567089 (diff) | |
| parent | 9a67e6c74367b82896b30f0d02a2e1e748ed7c5e (diff) | |
| download | cpython-3c8d0cc5e5c79bb9420a6c46a1ee7a52c089a253.zip cpython-3c8d0cc5e5c79bb9420a6c46a1ee7a52c089a253.tar.gz cpython-3c8d0cc5e5c79bb9420a6c46a1ee7a52c089a253.tar.bz2 | |
Merge heads.
| -rw-r--r-- | Lib/subprocess.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/subprocess.py b/Lib/subprocess.py index 383085e..ffa3bd1 100644 --- a/Lib/subprocess.py +++ b/Lib/subprocess.py @@ -1113,11 +1113,11 @@ class Popen(object): 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. |