[Python-checkins] cpython (merge 3.4 -> default): (Merge 3.4) Issue #21700: Fix asyncio doc, add DatagramProtocol

Tue Jun 10 09:21:20 CEST 2014

http://hg.python.org/cpython/rev/a8dfdae4c4a0
changeset: 91114:a8dfdae4c4a0
parent: 91112:4103556acb4e
parent: 91113:79562a31e5a6
user: Victor Stinner <victor.stinner at gmail.com>
date: Tue Jun 10 09:21:07 2014 +0200
summary:
 (Merge 3.4) Issue #21700: Fix asyncio doc, add DatagramProtocol
files:
 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
--- a/Doc/library/asyncio-protocol.rst
+++ b/Doc/library/asyncio-protocol.rst
@@ -272,8 +272,8 @@
 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 @@
 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:
-- 
Repository URL: http://hg.python.org/cpython
