[Python-checkins] cpython (merge 3.2 -> default): merge 3.2

benjamin.peterson python-checkins at python.org
Fri Apr 6 04:57:17 CEST 2012


http://hg.python.org/cpython/rev/9506e636bd9f
changeset:   76133:9506e636bd9f
parent:      76132:ec3e0f1a3b8d
parent:      76130:acea9d95a6d8
user:        Benjamin Peterson <benjamin at python.org>
date:        Thu Apr 05 22:57:10 2012 -0400
summary:
  merge 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.
 
-   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.
 

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


More information about the Python-checkins mailing list