[Python-checkins] cpython (merge 3.4 -> default): Merge 3.4 (asyncio)

Tue Mar 10 16:35:30 CET 2015

https://hg.python.org/cpython/rev/be3b41703822
changeset: 94931:be3b41703822
parent: 94929:388edf038328
parent: 94930:869eff562b55
user: Victor Stinner <victor.stinner at gmail.com>
date: Tue Mar 10 16:32:50 2015 +0100
summary:
 Merge 3.4 (asyncio)
files:
 Lib/asyncio/base_subprocess.py | 7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Lib/asyncio/base_subprocess.py b/Lib/asyncio/base_subprocess.py
--- a/Lib/asyncio/base_subprocess.py
+++ b/Lib/asyncio/base_subprocess.py
@@ -54,11 +54,14 @@
 info = [self.__class__.__name__]
 if self._closed:
 info.append('closed')
- info.append('pid=%s' % self._pid)
+ if self._pid is not None:
+ info.append('pid=%s' % self._pid)
 if self._returncode is not None:
 info.append('returncode=%s' % self._returncode)
+ elif self._pid is not None:
+ info.append('running')
 else:
- info.append('running')
+ info.append('not started')
 
 stdin = self._pipes.get(0)
 if stdin is not None:
-- 
Repository URL: https://hg.python.org/cpython
