merge 3.2

This commit is contained in:
Benjamin Peterson 2012-04-05 22:57:10 -04:00
commit e0029baba6
1 changed files with 1 additions and 1 deletions

View File

@ -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.