[Python-checkins] cpython: Fix timeout error message on windows to not be in milliseconds.

[reid.kleckner]

http://hg.python.org/cpython/rev/ab2363f89058
changeset:   68807:ab2363f89058
user:        Reid Kleckner <reid at kleckner.net>
date:        Mon Mar 21 10:06:10 2011 -0700
summary:
  Fix timeout error message on windows to not be in milliseconds.

files:
  Lib/subprocess.py

diff --git a/Lib/subprocess.py b/Lib/subprocess.py
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -1068,11 +1068,12 @@
             if endtime is not None:
                 timeout = self._remaining_time(endtime)
             if timeout is None:
-                timeout = _subprocess.INFINITE
+                timeout_millis = _subprocess.INFINITE
             else:
-                timeout = int(timeout * 1000)
+                timeout_millis = int(timeout * 1000)
             if self.returncode is None:
-                result = _subprocess.WaitForSingleObject(self._handle, timeout)
+                result = _subprocess.WaitForSingleObject(self._handle,
+                                                         timeout_millis)
                 if result == _subprocess.WAIT_TIMEOUT:
                     raise TimeoutExpired(self.args, timeout)
                 self.returncode = _subprocess.GetExitCodeProcess(self._handle)

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