commit 9a67e6c74367b82896b30f0d02a2e1e748ed7c5e
author Reid Kleckner <reid@kleckner.net> Sun Mar 20 08:28:07 2011 -0700
committer Reid Kleckner <reid@kleckner.net> Sun Mar 20 08:28:07 2011 -0700
tree 0207afb0155bed60d12c371f25b29de256701a91
parent 5b5394c6dfa76eb3d9f3448f5410d230ef8cd948

Fix the Windows timeout code.

Lib/subprocess.py

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 @@
             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.