[Python-checkins] cpython: Fix the Windows timeout code.
reid.kleckner
python-checkins at python.org
Sun Mar 20 16:28:15 CET 2011
http://hg.python.org/cpython/rev/6017c431ff0d
changeset: 68750:6017c431ff0d
user: Reid Kleckner <reid at kleckner.net>
date: Sun Mar 20 08:28:07 2011 -0700
summary:
Fix the Windows timeout code.
files:
Lib/subprocess.py
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
More information about the Python-checkins
mailing list