(original) (raw)

changeset: 80362:d478df13abde branch: 3.2 parent: 80358:ba45976c2801 user: Gregory P. Smith greg@krypto.org date: Sat Nov 10 20:52:29 2012 -0800 files: Lib/subprocess.py Misc/NEWS description: Fixes issue #14396: Handle the odd rare case of waitpid returning 0 when not expected in subprocess.Popen.wait(). diff -r ba45976c2801 -r d478df13abde Lib/subprocess.py --- a/Lib/subprocess.py Sat Nov 10 20:33:07 2012 -0800 +++ b/Lib/subprocess.py Sat Nov 10 20:52:29 2012 -0800 @@ -1428,7 +1428,7 @@ def wait(self): """Wait for child process to terminate. Returns returncode attribute.""" - if self.returncode is None: + while self.returncode is None: try: pid, sts = _eintr_retry_call(os.waitpid, self.pid, 0) except OSError as e: @@ -1437,8 +1437,12 @@ # This happens if SIGCLD is set to be ignored or waiting # for child processes has otherwise been disabled for our # process. This child is dead, we can't get the status. + pid = self.pid sts = 0 - self._handle_exitstatus(sts) + # Check the pid and loop as waitpid has been known to return + # 0 even without WNOHANG in odd situations. issue14396. + if pid == self.pid: + self._handle_exitstatus(sts) return self.returncode diff -r ba45976c2801 -r d478df13abde Misc/NEWS --- a/Misc/NEWS Sat Nov 10 20:33:07 2012 -0800 +++ b/Misc/NEWS Sat Nov 10 20:52:29 2012 -0800 @@ -10,6 +10,9 @@ Core and Builtins ----------------- +- Issue #14396: Handle the odd rare case of waitpid returning 0 when not + expected in subprocess.Popen.wait(). + - Issue #9535: Fix pending signals that have been received but not yet handled by Python to not persist after os.fork() in the child process. /greg@krypto.org