[Python-checkins] r81181 - in python/branches/py3k: Lib/subprocess.py

[victor.stinner]

Author: victor.stinner
Date: Fri May 14 23:53:45 2010
New Revision: 81181

Log:
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)
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/subprocess.py

Modified: python/branches/py3k/Lib/subprocess.py
==============================================================================
--- python/branches/py3k/Lib/subprocess.py	(original)
+++ python/branches/py3k/Lib/subprocess.py	Fri May 14 23:53:45 2010
@@ -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.