[Python-checkins] cpython (merge 3.4 -> default): Merge 3.4

[andrew.svetlov]

https://hg.python.org/cpython/rev/e5ff10873d0f
changeset:   95912:e5ff10873d0f
parent:      95910:36d5e04b6cfa
parent:      95911:7eb524cbe6e5
user:        Andrew Svetlov <andrew.svetlov at gmail.com>
date:        Fri May 08 14:15:11 2015 +0300
summary:
  Merge 3.4

files:
  Doc/library/asyncio-sync.rst |  3 +--
  1 files changed, 1 insertions(+), 2 deletions(-)


diff --git a/Doc/library/asyncio-sync.rst b/Doc/library/asyncio-sync.rst
--- a/Doc/library/asyncio-sync.rst
+++ b/Doc/library/asyncio-sync.rst
@@ -275,7 +275,7 @@
 
       Returns ``True`` if semaphore can not be acquired immediately.
 
-   .. coroutinemethod:: release()
+   .. method:: release()
 
       Release a semaphore, incrementing the internal counter by one. When it
       was zero on entry and another coroutine is waiting for it to become
@@ -291,4 +291,3 @@
 
    This raises :exc:`ValueError` in :meth:`~Semaphore.release` if it would
    increase the value above the initial value.
-

-- 
Repository URL: https://hg.python.org/cpython