diff options
author | Victor Stinner <victor.stinner@gmail.com> | 2014-06-10 09:21:07 +0200 |
---|---|---|
committer | Victor Stinner <victor.stinner@gmail.com> | 2014-06-10 09:21:07 +0200 |
commit | 601f86207bc7533e6c7736fc2a4ce6b1517ec7e5 (patch) | |
tree | ef346653eab32bfd17f277188a4097127a757d1f | |
parent | eb5ba067c9d38aaa4bba6bb4c87355b5eae6eba0 (diff) | |
parent | 15386652bfc57721d52e00e43a0e2ed66724995d (diff) | |
download | cpython-git-601f86207bc7533e6c7736fc2a4ce6b1517ec7e5.tar.gz |
(Merge 3.4) Issue #21700: Fix asyncio doc, add DatagramProtocol
-rw-r--r-- | Doc/library/asyncio-protocol.rst | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Doc/library/asyncio-protocol.rst b/Doc/library/asyncio-protocol.rst index 58c94aebf6..9c52b384c2 100644 --- a/Doc/library/asyncio-protocol.rst +++ b/Doc/library/asyncio-protocol.rst @@ -272,8 +272,8 @@ Protocol classes Connection callbacks -------------------- -These callbacks may be called on :class:`Protocol` and -:class:`SubprocessProtocol` instances: +These callbacks may be called on :class:`Protocol`, :class:`DatagramProtocol` +and :class:`SubprocessProtocol` instances: .. method:: BaseProtocol.connection_made(transport) @@ -291,10 +291,10 @@ These callbacks may be called on :class:`Protocol` and The latter means a regular EOF is received, or the connection was aborted or closed by this side of the connection. -:meth:`connection_made` and :meth:`connection_lost` are called exactly once -per successful connection. All other callbacks will be called between those -two methods, which allows for easier resource management in your protocol -implementation. +:meth:`~BaseProtocol.connection_made` and :meth:`~BaseProtocol.connection_lost` +are called exactly once per successful connection. All other callbacks will be +called between those two methods, which allows for easier resource management +in your protocol implementation. The following callbacks may be called only on :class:`SubprocessProtocol` instances: |