merge with 3.3

This commit is contained in:
Georg Brandl
2013-10-06 10:48:48 +02:00

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.