Skip to content

Commit

Permalink
merge 3.4
Browse files Browse the repository at this point in the history
  • Loading branch information
asvetlov committed Jan 11, 2016
2 parents 3feb946 + 9d976fa commit 4ea31f5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Lib/asyncio/tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 4ea31f5

Please sign in to comment.