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)
  ........
................
This commit is contained in:
Victor Stinner 2010-05-14 21:57:25 +00:00
parent 7f6423a0b4
commit 20f97be46e
1 changed files with 3 additions and 3 deletions

View File

@ -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.