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

merge with 3.3

This commit is contained in:
Georg Brandl 2013-10-06 10:48:48 +02:00
parent 42b0ff80a2 b19ef1846c
commit 55f4d56091
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Doc/library/threading.rst
View File

@ -387,7 +387,7 @@ All methods are executed atomically.
When invoked with the floating-point *timeout* argument set to a positive
value, block for at most the number of seconds specified by *timeout*
and as long as the lock cannot be acquired. A negative *timeout* argument
and as long as the lock cannot be acquired. A *timeout* argument of ``-1``
specifies an unbounded wait. It is forbidden to specify a *timeout*
when *blocking* is false.