diff options
author | Victor Stinner <victor.stinner@gmail.com> | 2015-01-23 00:52:06 +0100 |
---|---|---|
committer | Victor Stinner <victor.stinner@gmail.com> | 2015-01-23 00:52:06 +0100 |
commit | a14dece8f3e9afb3dce4be9657bf4545e4dfd08a (patch) | |
tree | 3485ff98b6e44446d80e203b9ed86894dc1a54f0 | |
parent | 5570ba2a0975c69dab2865345b70485755d93866 (diff) | |
download | trollius-a14dece8f3e9afb3dce4be9657bf4545e4dfd08a.tar.gz |
Close transports on error
Fix create_datagram_endpoint(), connect_read_pipe() and connect_write_pipe():
close the transport if the task is cancelled or on error.
-rw-r--r-- | asyncio/base_events.py | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/asyncio/base_events.py b/asyncio/base_events.py index 1ceeb2d..e43441e 100644 --- a/asyncio/base_events.py +++ b/asyncio/base_events.py @@ -723,7 +723,13 @@ class BaseEventLoop(events.AbstractEventLoop): logger.debug("Datagram endpoint remote_addr=%r created: " "(%r, %r)", remote_addr, transport, protocol) - yield from waiter + + try: + yield from waiter + except: + transport.close() + raise + return transport, protocol @coroutine @@ -815,7 +821,13 @@ class BaseEventLoop(events.AbstractEventLoop): protocol = protocol_factory() waiter = futures.Future(loop=self) transport = self._make_read_pipe_transport(pipe, protocol, waiter) - yield from waiter + + try: + yield from waiter + except: + transport.close() + raise + if self._debug: logger.debug('Read pipe %r connected: (%r, %r)', pipe.fileno(), transport, protocol) @@ -826,7 +838,13 @@ class BaseEventLoop(events.AbstractEventLoop): protocol = protocol_factory() waiter = futures.Future(loop=self) transport = self._make_write_pipe_transport(pipe, protocol, waiter) - yield from waiter + + try: + yield from waiter + except: + transport.close() + raise + if self._debug: logger.debug('Write pipe %r connected: (%r, %r)', pipe.fileno(), transport, protocol) |