merge 3.2

2012-04-05 22:57:10 -04:00 · 2012-04-05 22:57:10 -04:00 · e0029baba6
parent e3c3f24736 fee3fc748e
commit e0029baba6
1 changed files with 1 additions and 1 deletions
--- a/Doc/library/threading.rst
+++ b/Doc/library/threading.rst
@ -452,7 +452,7 @@ All methods are executed atomically.
   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.