summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Svetlov <andrew.svetlov@gmail.com>2016-01-11 10:26:02 (GMT)
committerAndrew Svetlov <andrew.svetlov@gmail.com>2016-01-11 10:26:02 (GMT)
commit511bf7880cdc24f86ee4a94eea28a10f5805a7e9 (patch)
tree8e457556b74517e4b6006cf62d245c4c6e04a183
parent97558412ceb8f3511a01b3186adaeb658bf3e518 (diff)
parent4ea31f5b86e946301d60251e5ea72e87dda34e46 (diff)
downloadcpython-511bf7880cdc24f86ee4a94eea28a10f5805a7e9.zip
cpython-511bf7880cdc24f86ee4a94eea28a10f5805a7e9.tar.gz
cpython-511bf7880cdc24f86ee4a94eea28a10f5805a7e9.tar.bz2
merge 3.5
-rw-r--r--Lib/asyncio/tasks.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/asyncio/tasks.py b/Lib/asyncio/tasks.py
index 3c25e2d..c37aa41 100644
--- a/Lib/asyncio/tasks.py
+++ b/Lib/asyncio/tasks.py
@@ -744,7 +744,7 @@ def timeout(timeout, *, loop=None):
For example:
>>> with asyncio.timeout(0.001):
- >>> yield from coro()
+ ... yield from coro()
timeout: timeout value in seconds