Mercurial > cpython-lru_cache-weakref
diff Lib/subprocess.py @ 48155:dc850da04bd5 2.5
(backport r65459 from trunk)
- Issue #1857: subprocess.Popen.poll gained an additional _deadstate keyword
argument in python 2.5, this broke code that subclassed Popen to include its
own poll method. Fixed my moving _deadstate to an _internal_poll method.
| author | Gregory P. Smith <greg@mad-scientist.com> |
|---|---|
| date | Mon, 04 Aug 2008 00:15:54 +0000 |
| parents | 6404446e5aa3 |
| children | 641edee4fcb1 |
line wrap: on
line diff
--- a/Lib/subprocess.py Sat Aug 02 07:21:06 2008 +0000 +++ b/Lib/subprocess.py Mon Aug 04 00:15:54 2008 +0000 @@ -421,7 +421,7 @@ def _cleanup(): for inst in _active[:]: - if inst.poll(_deadstate=sys.maxint) >= 0: + if inst._internal_poll(_deadstate=sys.maxint) >= 0: try: _active.remove(inst) except ValueError: @@ -634,7 +634,7 @@ # We didn't get to successfully create a child process. return # In case the child hasn't been waited on, check if it's done. - self.poll(_deadstate=sys.maxint) + self._internal_poll(_deadstate=sys.maxint) if self.returncode is None and _active is not None: # Child is still running, keep us alive until we can wait on it. _active.append(self) @@ -670,6 +670,10 @@ return self._communicate(input) + def poll(self): + return self._internal_poll() + + if mswindows: # # Windows methods @@ -843,7 +847,7 @@ errwrite.Close() - def poll(self, _deadstate=None): + def _internal_poll(self, _deadstate=None): """Check if child process has terminated. Returns returncode attribute.""" if self.returncode is None: @@ -1103,7 +1107,7 @@ raise RuntimeError("Unknown child exit status!") - def poll(self, _deadstate=None): + def _internal_poll(self, _deadstate=None): """Check if child process has terminated. Returns returncode attribute.""" if self.returncode is None: