diff options
| author | Georg Brandl <georg@python.org> | 2013-10-06 08:48:48 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2013-10-06 08:48:48 (GMT) |
| commit | 55f4d56091c92f64bef61bed23d993441f5ed78e (patch) | |
| tree | 8e8dcaa4069f76f3919d31417109253633b238a1 /Doc/library/threading.rst | |
| parent | 42b0ff80a27c061db5c9ad839705c5a94d4f781e (diff) | |
| parent | b19ef1846c5c37f9a0ed9f385a35fdd8d4b9a876 (diff) | |
| download | cpython-55f4d56091c92f64bef61bed23d993441f5ed78e.zip cpython-55f4d56091c92f64bef61bed23d993441f5ed78e.tar.gz cpython-55f4d56091c92f64bef61bed23d993441f5ed78e.tar.bz2 | |
merge with 3.3
Diffstat (limited to 'Doc/library/threading.rst')
| -rw-r--r-- | Doc/library/threading.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst index 9aec63d..4a3b3ea 100644 --- a/Doc/library/threading.rst +++ b/Doc/library/threading.rst @@ -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. |