summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2012-04-06 02:57:10 (GMT)
committerBenjamin Peterson <benjamin@python.org>2012-04-06 02:57:10 (GMT)
commite0029baba65d4f6a29998edb9de091f1ef66d6e0 (patch)
tree2f9b409fe79d26696734708bc2062e5d63b075ab /Doc/library
parente3c3f24736ac26369c9562a8823a19a7420f59db (diff)
parentfee3fc748e4c6e00cdd44c079e54cacef00690cf (diff)
downloadcpython-e0029baba65d4f6a29998edb9de091f1ef66d6e0.zip
cpython-e0029baba65d4f6a29998edb9de091f1ef66d6e0.tar.gz
cpython-e0029baba65d4f6a29998edb9de091f1ef66d6e0.tar.bz2
merge 3.2
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/threading.rst2
1 files changed, 1 insertions, 1 deletions
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 @@ 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.