diff Lib/subprocess.py @ 61584:fa902f8e0db0

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) ........
author Victor Stinner <victor.stinner@haypocalc.com>
date Fri, 14 May 2010 21:53:45 +0000
parents ccf1ca73c0e9
children cf74ec3e1f82
line wrap: on
line diff
--- a/Lib/subprocess.py	Fri May 14 16:35:39 2010 +0000
+++ b/Lib/subprocess.py	Fri May 14 21:53:45 2010 +0000
@@ -908,9 +908,9 @@
 
 
         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.