summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2015-03-10 15:32:50 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2015-03-10 15:32:50 (GMT)
commite3e56fea2a5cec7546c1cb5dceef53a6deb51107 (patch)
tree1c724085cec6e8b3a99f0577b89706315a169068 /Lib
parentfb581d9154c1df095ab9fbd1690fbc2f77f44530 (diff)
parent7a82afee70425782d27f4ed2c6d0bad3aeb91f09 (diff)
downloadcpython-e3e56fea2a5cec7546c1cb5dceef53a6deb51107.zip
cpython-e3e56fea2a5cec7546c1cb5dceef53a6deb51107.tar.gz
cpython-e3e56fea2a5cec7546c1cb5dceef53a6deb51107.tar.bz2
Merge 3.4 (asyncio)
Diffstat (limited to 'Lib')
-rw-r--r--Lib/asyncio/base_subprocess.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/Lib/asyncio/base_subprocess.py b/Lib/asyncio/base_subprocess.py
index c1cdfda..d18f3e8 100644
--- a/Lib/asyncio/base_subprocess.py
+++ b/Lib/asyncio/base_subprocess.py
@@ -54,11 +54,14 @@ class BaseSubprocessTransport(transports.SubprocessTransport):
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)
- else:
+ elif self._pid is not None:
info.append('running')
+ else:
+ info.append('not started')
stdin = self._pipes.get(0)
if stdin is not None: