Merge 3.4

This commit is contained in:
Andrew Svetlov 2015-05-08 14:15:11 +03:00
commit 0048835e49

View file

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