summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2014-10-12 22:56:02 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2014-10-12 22:56:02 (GMT)
commit3efa148aa38bb2d1413e5b53cdfce20b65a899aa (patch)
tree9401a2c763289ab39266ebb164ef9924fda9556d
parent6682efa246258d6dc8054d4228305e29916b9945 (diff)
parented8e3a987e89c2a9c197fc9e6d576defb4b3edab (diff)
downloadcpython-3efa148aa38bb2d1413e5b53cdfce20b65a899aa.zip
cpython-3efa148aa38bb2d1413e5b53cdfce20b65a899aa.tar.gz
cpython-3efa148aa38bb2d1413e5b53cdfce20b65a899aa.tar.bz2
Merge 3.4 (asyncio doc)
-rw-r--r--Doc/library/asyncio-stream.rst2
1 files changed, 2 insertions, 0 deletions
diff --git a/Doc/library/asyncio-stream.rst b/Doc/library/asyncio-stream.rst
index 1e6dc94..348132a 100644
--- a/Doc/library/asyncio-stream.rst
+++ b/Doc/library/asyncio-stream.rst
@@ -250,6 +250,7 @@ TCP echo client using the :func:`asyncio.open_connection` function::
import asyncio
+ @asyncio.coroutine
def tcp_echo_client(message, loop):
reader, writer = yield from asyncio.open_connection('127.0.0.1', 8888,
loop=loop)
@@ -379,6 +380,7 @@ Coroutine waiting until a socket receives data using the
except ImportError:
from asyncio.windows_utils import socketpair
+ @asyncio.coroutine
def wait_for_data(loop):
# Create a pair of connected sockets
rsock, wsock = socketpair()