Mercurial > cpython-lru_cache-weakref
diff Lib/subprocess.py @ 61585:0e37a95cdcfb 3.1
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)
........
................
| author | Victor Stinner <victor.stinner@haypocalc.com> |
|---|---|
| date | Fri, 14 May 2010 21:57:25 +0000 |
| parents | 58a56aba0eb2 |
| children | 5de52eb252da |
line wrap: on
line diff
--- a/Lib/subprocess.py Fri May 14 20:08:55 2010 +0000 +++ b/Lib/subprocess.py Fri May 14 21:57:25 2010 +0000 @@ -884,9 +884,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.