diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2015-01-15 13:25:08 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2015-01-15 13:25:08 (GMT) |
| commit | 9fef5244ebbfddf18889d2b9669f50e2ee3fc449 (patch) | |
| tree | d3854a28ee4ad0bebc5ea4384513ce2aea1523e2 /Lib/asyncio | |
| parent | d021c1d3953f95745e30ec4148f324a8d28a29d0 (diff) | |
| parent | ab8848bc2a64930e0e9a2e56592bb692fb31d9e9 (diff) | |
| download | cpython-9fef5244ebbfddf18889d2b9669f50e2ee3fc449.zip cpython-9fef5244ebbfddf18889d2b9669f50e2ee3fc449.tar.gz cpython-9fef5244ebbfddf18889d2b9669f50e2ee3fc449.tar.bz2 | |
Merge 3.4 (asyncio)
Diffstat (limited to 'Lib/asyncio')
| -rw-r--r-- | Lib/asyncio/unix_events.py | 6 | ||||
| -rw-r--r-- | Lib/asyncio/windows_events.py | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/Lib/asyncio/unix_events.py b/Lib/asyncio/unix_events.py index 9f4005c..97f9add 100644 --- a/Lib/asyncio/unix_events.py +++ b/Lib/asyncio/unix_events.py @@ -177,7 +177,11 @@ class _UnixSelectorEventLoop(selector_events.BaseSelectorEventLoop): transp = _UnixSubprocessTransport(self, protocol, args, shell, stdin, stdout, stderr, bufsize, extra=extra, **kwargs) - yield from transp._post_init() + try: + yield from transp._post_init() + except: + transp.close() + raise watcher.add_child_handler(transp.get_pid(), self._child_watcher_callback, transp) diff --git a/Lib/asyncio/windows_events.py b/Lib/asyncio/windows_events.py index 9d496f2..82d0966 100644 --- a/Lib/asyncio/windows_events.py +++ b/Lib/asyncio/windows_events.py @@ -272,7 +272,12 @@ class ProactorEventLoop(proactor_events.BaseProactorEventLoop): transp = _WindowsSubprocessTransport(self, protocol, args, shell, stdin, stdout, stderr, bufsize, extra=extra, **kwargs) - yield from transp._post_init() + try: + yield from transp._post_init() + except: + transp.close() + raise + return transp |