Fix the Windows timeout code.

diff --git a/Lib/subprocess.py b/Lib/subprocess.py
index 383085ec7218adb899136c299aaa6171ffa09dee..ffa3bd100a487882fc0bea2a07a281871c0d9dd9 100644 (file)
--- 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.