From: Reid Kleckner <reid@kleckner.net>
Date: Mon, 21 Mar 2011 17:06:10 +0000 (-0700)
Subject: Fix timeout error message on windows to not be in milliseconds.
X-Git-Tag: v3.3.0a1~2814
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=91156ff3f1b0cd62a1771283f080cc2fe4527838;p=thirdparty%2FPython%2Fcpython.git

Fix timeout error message on windows to not be in milliseconds.
---

diff --git a/Lib/subprocess.py b/Lib/subprocess.py
index ffa3bd100a48..4c6635352fde 100644
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -1068,11 +1068,12 @@ class Popen(object):
             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)