From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Fri, 14 May 2010 21:53:32 +0000 (+0000)
Subject: Merged revisions 81179 via svnmerge from
X-Git-Tag: v2.6.6rc1~327
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f7b5def8b479328f9234d49aa078e5e2730db984;p=thirdparty%2FPython%2Fcpython.git

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 d668cb4db162..00dbfbaa7110 100644
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -859,9 +859,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.