summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorAndrew Svetlov <andrew.svetlov@gmail.com>2016-01-11 10:25:40 (GMT)
committerAndrew Svetlov <andrew.svetlov@gmail.com>2016-01-11 10:25:40 (GMT)
commit4ea31f5b86e946301d60251e5ea72e87dda34e46 (patch)
tree16e604c2fde715d8417574e60a718afdf312b496 /Lib
parent3feb9460ed919eaea34548fb655e63da194e546e (diff)
parent9d976fa75f7862891bca4b66129ec07909683a83 (diff)
downloadcpython-4ea31f5b86e946301d60251e5ea72e87dda34e46.zip
cpython-4ea31f5b86e946301d60251e5ea72e87dda34e46.tar.gz
cpython-4ea31f5b86e946301d60251e5ea72e87dda34e46.tar.bz2
merge 3.4
Diffstat (limited to 'Lib')
-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