From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Fri, 14 May 2010 21:57:25 +0000 (+0000)
Subject: Merged revisions 81181 via svnmerge from
X-Git-Tag: v3.1.3rc1~768
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=20f97be46e45790c08644309dd246879a018bdaa;p=python

Merged revisions 81181 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r81181 | victor.stinner | 2010-05-14 23:53:45 +0200 (ven., 14 mai 2010) | 9 lines

  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 0656c842ee..74b049fde6 100644
--- a/Lib/subprocess.py
+++ b/Lib/subprocess.py
@@ -884,9 +884,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.