diff options
author | Victor Stinner <victor.stinner@haypocalc.com> | 2010-05-14 21:53:45 +0000 |
---|---|---|
committer | Victor Stinner <victor.stinner@haypocalc.com> | 2010-05-14 21:53:45 +0000 |
commit | 0f45d5306901837dd69209a38c4e303fe629f05c (patch) | |
tree | 8d79b2fc8211bcd0c7ad45ed551d7e47a3427dd8 | |
parent | 26fb5996a75473b4bdd3f1c01f986a74d7ac9f9d (diff) | |
download | cpython-0f45d5306901837dd69209a38c4e303fe629f05c.tar.gz |
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)
........
-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 8186a76b65..14f1f67681 100644 --- a/Lib/subprocess.py +++ b/Lib/subprocess.py @@ -908,9 +908,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. |