summaryrefslogtreecommitdiffstats
path: root/Doc/library/asyncio-protocol.rst
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2014-01-16 18:30:21 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2014-01-16 18:30:21 (GMT)
commit59759ff23420868b1b45de37f6ad6dc7de81778a (patch)
treeaf0ce1195c186c6e56d45002402e378470d5498d /Doc/library/asyncio-protocol.rst
parentdb39a0da0ca6839177f00be9f38446fa717a4958 (diff)
downloadcpython-59759ff23420868b1b45de37f6ad6dc7de81778a.zip
cpython-59759ff23420868b1b45de37f6ad6dc7de81778a.tar.gz
cpython-59759ff23420868b1b45de37f6ad6dc7de81778a.tar.bz2
asyncio doc: replace "coroutine" with "coroutine object" or "coroutine function"
Diffstat (limited to 'Doc/library/asyncio-protocol.rst')
-rw-r--r--Doc/library/asyncio-protocol.rst14
1 files changed, 7 insertions, 7 deletions
diff --git a/Doc/library/asyncio-protocol.rst b/Doc/library/asyncio-protocol.rst
index a5383cc..00e4250 100644
--- a/Doc/library/asyncio-protocol.rst
+++ b/Doc/library/asyncio-protocol.rst
@@ -320,19 +320,19 @@ StreamReader
XXX
- This method returns a :ref:`coroutine <coroutine>`.
+ This method returns a :ref:`coroutine object <coroutine>`.
.. method:: readline()
XXX
- This method returns a :ref:`coroutine <coroutine>`.
+ This method returns a :ref:`coroutine object <coroutine>`.
.. method:: readexactly(n)
XXX
- This method returns a :ref:`coroutine <coroutine>`.
+ This method returns a :ref:`coroutine object <coroutine>`.
@@ -550,7 +550,7 @@ Network functions
:class:`StreamReaderProtocol` classes, just copy the code -- there's really
nothing special here except some convenience.)
- This function returns a :ref:`coroutine <coroutine>`.
+ This function returns a :ref:`coroutine object <coroutine>`.
.. function:: start_server(client_connected_cb, host=None, port=None, *, loop=None, limit=_DEFAULT_LIMIT, **kwds)
@@ -560,8 +560,8 @@ Network functions
*client_reader*, *client_writer*. *client_reader* is a
:class:`StreamReader` object, while *client_writer* is a
:class:`StreamWriter` object. This parameter can either be a plain callback
- function or a :ref:`coroutine <coroutine>`; if it is a coroutine, it will be
- automatically converted into a :class:`Task`.
+ function or a :ref:`coroutine function <coroutine>`; if it is a coroutine
+ function, it will be automatically converted into a :class:`Task`.
The rest of the arguments are all the usual arguments to
:meth:`~BaseEventLoop.create_server()` except *protocol_factory*; most
@@ -576,7 +576,7 @@ Network functions
The return value is the same as :meth:`~BaseEventLoop.create_server()`, i.e.
a :class:`AbstractServer` object which can be used to stop the service.
- This function returns a :ref:`coroutine <coroutine>`.
+ This function returns a :ref:`coroutine object <coroutine>`.
Protocol example: TCP echo server and client