summaryrefslogtreecommitdiff
path: root/Doc/library/_thread.rst
diff options
context:
space:
mode:
authorMartin v. L?wis <martin@v.loewis.de>2012-04-20 14:37:17 +0200
committerMartin v. L?wis <martin@v.loewis.de>2012-04-20 14:37:17 +0200
commitb467205669cae187c9bbce311069c4875518bfae (patch)
treece7686f020917e8883d1818b8fadece2cc15fa06 /Doc/library/_thread.rst
parentf235cad91035d648e09ae7a1867fc9aa49ae8963 (diff)
parent2c826ad61cf991d15646ae7bfac2d0cb34535cd8 (diff)
downloadcpython-b467205669cae187c9bbce311069c4875518bfae.tar.gz
merge 3.2: issue 14629
Diffstat (limited to 'Doc/library/_thread.rst')
-rw-r--r--Doc/library/_thread.rst5
1 files changed, 4 insertions, 1 deletions
diff --git a/Doc/library/_thread.rst b/Doc/library/_thread.rst
index 369e9cd01e..751c3e8849 100644
--- a/Doc/library/_thread.rst
+++ b/Doc/library/_thread.rst
@@ -35,6 +35,9 @@ It defines the following constants and functions:
Raised on thread-specific errors.
+ .. versionchanged:: 3.3
+ This is now a synonym of the built-in :exc:`RuntimeError`.
+
.. data:: LockType
@@ -91,7 +94,7 @@ It defines the following constants and functions:
*size* argument specifies the stack size to be used for subsequently created
threads, and must be 0 (use platform or configured default) or a positive
integer value of at least 32,768 (32kB). If changing the thread stack size is
- unsupported, a :exc:`ThreadError` is raised. If the specified stack size is
+ unsupported, a :exc:`RuntimeError` is raised. If the specified stack size is
invalid, a :exc:`ValueError` is raised and the stack size is unmodified. 32kB
is currently the minimum supported stack size value to guarantee sufficient
stack space for the interpreter itself. Note that some platforms may have