diff options
author | Zachary Ware <zachary.ware@gmail.com> | 2015-05-07 01:19:35 (GMT) |
---|---|---|
committer | Zachary Ware <zachary.ware@gmail.com> | 2015-05-07 01:19:35 (GMT) |
commit | 7a04a89ec974c66d254b4b3039c2ef06fd7b3fd8 (patch) | |
tree | 0ae322d30e882e31d93a663da761d87dadd4235d | |
parent | fe373a542559cf6f3a8e78322efeaa0a5bc94beb (diff) | |
parent | 828946e561389105b27cd7e00b4ab0f5e8caa03a (diff) | |
download | cpython-7a04a89ec974c66d254b4b3039c2ef06fd7b3fd8.zip cpython-7a04a89ec974c66d254b4b3039c2ef06fd7b3fd8.tar.gz cpython-7a04a89ec974c66d254b4b3039c2ef06fd7b3fd8.tar.bz2 |
Merge from 3.4.
-rw-r--r-- | Doc/library/asyncio-sync.rst | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Doc/library/asyncio-sync.rst b/Doc/library/asyncio-sync.rst index 622ff5fd..7925731 100644 --- a/Doc/library/asyncio-sync.rst +++ b/Doc/library/asyncio-sync.rst @@ -196,9 +196,9 @@ Condition .. method:: notify_all() - Wake up all threads waiting on this condition. This method acts like - :meth:`notify`, but wakes up all waiting threads instead of one. If the - calling thread has not acquired the lock when this method is called, a + Wake up all coroutines waiting on this condition. This method acts like + :meth:`notify`, but wakes up all waiting coroutines instead of one. If the + calling coroutine has not acquired the lock when this method is called, a :exc:`RuntimeError` is raised. .. method:: release() @@ -250,7 +250,7 @@ Semaphore A semaphore manages an internal counter which is decremented by each :meth:`acquire` call and incremented by each :meth:`release` call. The counter can never go below zero; when :meth:`acquire` finds that it is zero, - it blocks, waiting until some other thread calls :meth:`release`. + it blocks, waiting until some other coroutine calls :meth:`release`. Semaphores also support the context management protocol. |