diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2010-05-14 21:57:25 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2010-05-14 21:57:25 (GMT) |
| commit | 20f97be46e45790c08644309dd246879a018bdaa (patch) | |
| tree | 5b3bff7f245f230d13d6d5d3f05a72e5900ab0bd /Lib | |
| parent | 7f6423a0b42a53cba4879aa97dd3702811b86278 (diff) | |
| download | cpython-20f97be46e45790c08644309dd246879a018bdaa.zip cpython-20f97be46e45790c08644309dd246879a018bdaa.tar.gz cpython-20f97be46e45790c08644309dd246879a018bdaa.tar.bz2 | |
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)
........
................
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/subprocess.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/subprocess.py b/Lib/subprocess.py index 0656c84..74b049f 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. |