diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2010-05-14 21:53:45 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2010-05-14 21:53:45 (GMT) |
| commit | c807a613ee2f8e453795eeb3986d6e25d3166bd0 (patch) | |
| tree | 64c5305d54c674fc754879dfffcf4be5962ffab3 /Lib/subprocess.py | |
| parent | a45598a035a3a68e19e7aebff7c5ddf003517363 (diff) | |
| download | cpython-c807a613ee2f8e453795eeb3986d6e25d3166bd0.zip cpython-c807a613ee2f8e453795eeb3986d6e25d3166bd0.tar.gz cpython-c807a613ee2f8e453795eeb3986d6e25d3166bd0.tar.bz2 | |
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/subprocess.py')
| -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 8186a76..14f1f67 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. |