merge 3.4

asvetlov · asvetlov · commit 4ea31f5b86e9 · 2016-01-11T12:25:40.000+02:00
diff --git 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
