Rooba
/
cpython
mirror of https://github.com/python/cpython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge 3.4

This commit is contained in:
Benjamin Peterson 2015-05-06 21:31:07 -04:00
parent fe373a5425 ad643b59ce
commit ec9b7728fe
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Doc/library/asyncio-sync.rst
View File

@ -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.

2
Doc/library/symtable.rst
View File

@ -185,4 +185,4 @@ Examining Symbol Tables
.. method:: get_namespace()
Return the namespace bound to this name. If more than one namespace is
bound, a :exc:`ValueError` is raised.
bound, :exc:`ValueError` is raised.