Merged revisions 81179 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81179 | victor.stinner | 2010-05-14 23:52:26 +0200 (ven., 14 mai 2010) | 2 lines

  Fix regression introduced by r81154 (Issue #5099, subprocess destructor)
........

diff --git a/Lib/subprocess.py b/Lib/subprocess.py
index 8186a76b6543dbeb28e4e6afe5b39ece06d724d2..14f1f67681e113f36de4249d7ab5db7f54c28921 100644 (file)
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -908,9 +908,9 @@ class Popen(object):
 
 
         def _internal_poll(self, _deadstate=None,
-                _WaitForSingleObject=WaitForSingleObject,
-                _WAIT_OBJECT_0=WAIT_OBJECT_0,
-                _GetExitCodeProcess=GetExitCodeProcess):
+                _WaitForSingleObject=_subprocess.WaitForSingleObject,
+                _WAIT_OBJECT_0=_subprocess.WAIT_OBJECT_0,
+                _GetExitCodeProcess=_subprocess.GetExitCodeProcess):
             """Check if child process has terminated.  Returns returncode
             attribute.