[Python-checkins] cpython: Issue #14502: merge with 3.2

[sandro.tosi]

http://hg.python.org/cpython/rev/c10a0f93544e
changeset:   76131:c10a0f93544e
parent:      76127:67c26185636b
user:        Sandro Tosi <sandro.tosi at gmail.com>
date:        Thu Apr 05 22:53:21 2012 +0200
summary:
  Issue #14502: merge with 3.2

files:
  Doc/library/threading.rst |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst
--- 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.
 
-   Do not call this method when the lock is unlocked.
+   When invoked on an unlocked lock, a :exc:`RuntimeError` is raised.
 
    There is no return value.
 

-- 
Repository URL: http://hg.python.org/cpython