| commit | e0029baba65d4f6a29998edb9de091f1ef66d6e0 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Thu Apr 05 22:57:10 2012 -0400 |
| committer | Benjamin Peterson <benjamin@python.org> | Thu Apr 05 22:57:10 2012 -0400 |
| tree | 2f9b409fe79d26696734708bc2062e5d63b075ab | |
| parent | e3c3f24736ac26369c9562a8823a19a7420f59db [diff] | |
| parent | fee3fc748e4c6e00cdd44c079e54cacef00690cf [diff] |
merge 3.2
diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst index d272731..955fce2 100644 --- a/Doc/library/threading.rst +++ b/Doc/library/threading.rst
@@ -452,7 +452,7 @@ are blocked waiting for the lock to become unlocked, allow exactly one of them to proceed. - When invoked on an unlocked lock, a :exc:`RuntimeError` is raised. + When invoked on an unlocked lock, a :exc:`ThreadError` is raised. There is no return value.