mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-02 03:01:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

asyncio: Replace connection_refused() with error_received().

Browse source
This commit is contained in:
Guido van Rossum 2013-11-15 16:51:48 -08:00
parent 6f87a08aa7
commit 2335de7a20
5 changed files with 39 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Lib/asyncio/protocols.py
View file

@ -100,15 +100,18 @@ class DatagramProtocol(BaseProtocol):
def datagram_received(self, data, addr):
"""Called when some datagram is received."""
def connection_refused(self, exc):
"""Connection is refused."""
def error_received(self, exc):
"""Called when a send or receive operation raises an OSError.
(Other than BlockingIOError or InterruptedError.)
"""
class SubprocessProtocol(BaseProtocol):
"""ABC representing a protocol for subprocess calls."""
def pipe_data_received(self, fd, data):
"""Called when subprocess write a data into stdout/stderr pipes.
"""Called when the subprocess writes data into stdout/stderr pipe.
fd is int file dascriptor.
data is bytes object.
@ -122,5 +125,4 @@ class SubprocessProtocol(BaseProtocol):
"""
def process_exited(self):
"""Called when subprocess has exited.
"""
"""Called when subprocess has exited."""

17
Lib/asyncio/selector_events.py
View file

@ -771,6 +771,8 @@ class _SelectorDatagramTransport(_SelectorTransport):
data, addr = self._sock.recvfrom(self.max_size)
except (BlockingIOError, InterruptedError):
pass
except OSError as exc:
self._protocol.error_received(exc)
except Exception as exc:
self._fatal_error(exc)
else:
@ -800,9 +802,8 @@ class _SelectorDatagramTransport(_SelectorTransport):
return
except (BlockingIOError, InterruptedError):
self._loop.add_writer(self._sock_fd, self._sendto_ready)
except ConnectionRefusedError as exc:
if self._address:
self._fatal_error(exc)
except OSError as exc:
self._protocol.error_received(exc)
return
except Exception as exc:
self._fatal_error(exc)
@ -822,9 +823,8 @@ class _SelectorDatagramTransport(_SelectorTransport):
except (BlockingIOError, InterruptedError):
self._buffer.appendleft((data, addr)) # Try again later.
break
except ConnectionRefusedError as exc:
if self._address:
self._fatal_error(exc)
except OSError as exc:
self._protocol.error_received(exc)
return
except Exception as exc:
self._fatal_error(exc)
@ -835,8 +835,3 @@ class _SelectorDatagramTransport(_SelectorTransport):
self._loop.remove_writer(self._sock_fd)
if self._closing:
self._call_connection_lost(None)
def _force_close(self, exc):
if self._address and isinstance(exc, ConnectionRefusedError):
self._protocol.connection_refused(exc)
super()._force_close(exc)