summaryrefslogtreecommitdiff
path: root/Lib/asyncio/windows_events.py
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2015-01-30 00:05:36 +0100
committerVictor Stinner <victor.stinner@gmail.com>2015-01-30 00:05:36 +0100
commita9373ec96657982c1c1673f6817f81d4a7aec833 (patch)
tree77d8f894a9e54640b3f1178b540dec7358e416ff /Lib/asyncio/windows_events.py
parent2647375cc98ac47dffdf495fc4b0fe5973b0375d (diff)
parent47cd10d7a903773f574fc93220dbca850067fa0c (diff)
downloadcpython-git-a9373ec96657982c1c1673f6817f81d4a7aec833.tar.gz
Merge 3.4 (asyncio)
Diffstat (limited to 'Lib/asyncio/windows_events.py')
-rw-r--r--Lib/asyncio/windows_events.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/Lib/asyncio/windows_events.py b/Lib/asyncio/windows_events.py
index 94aafb6f5a..437eb0ac9d 100644
--- a/Lib/asyncio/windows_events.py
+++ b/Lib/asyncio/windows_events.py
@@ -366,13 +366,16 @@ class ProactorEventLoop(proactor_events.BaseProactorEventLoop):
def _make_subprocess_transport(self, protocol, args, shell,
stdin, stdout, stderr, bufsize,
extra=None, **kwargs):
+ waiter = futures.Future(loop=self)
transp = _WindowsSubprocessTransport(self, protocol, args, shell,
stdin, stdout, stderr, bufsize,
- extra=extra, **kwargs)
+ waiter=waiter, extra=extra,
+ **kwargs)
try:
- yield from transp._post_init()
+ yield from waiter
except:
transp.close()
+ yield from transp.wait()
raise
return transp