summaryrefslogtreecommitdiffstats
path: root/Doc/c-api
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2011-02-25 11:19:59 (GMT)
committerGeorg Brandl <georg@python.org>2011-02-25 11:19:59 (GMT)
commit2682661cbc3806f8388f915a2e815b9d9642e487 (patch)
tree481ca31c6045eb6fa2ae4b21c77abecb3eae2c5b /Doc/c-api
parentd0a54d09153b80ef83eb4dd5c61026a234fe2d45 (diff)
downloadcpython-2682661cbc3806f8388f915a2e815b9d9642e487.zip
cpython-2682661cbc3806f8388f915a2e815b9d9642e487.tar.gz
cpython-2682661cbc3806f8388f915a2e815b9d9642e487.tar.bz2
#11317: fix wrong info about string exceptions.
Diffstat (limited to 'Doc/c-api')
-rw-r--r--Doc/c-api/exceptions.rst14
1 files changed, 5 insertions, 9 deletions
diff --git a/Doc/c-api/exceptions.rst b/Doc/c-api/exceptions.rst
index 3ed1313..e9ced0b 100644
--- a/Doc/c-api/exceptions.rst
+++ b/Doc/c-api/exceptions.rst
@@ -610,14 +610,10 @@ Notes:
.. versionadded:: 2.5
-Deprecation of String Exceptions
-================================
-
-.. index:: single: BaseException (built-in exception)
-
-All exceptions built into Python or provided in the standard library are derived
-from :exc:`BaseException`.
+String Exceptions
+=================
-String exceptions are still supported in the interpreter to allow existing code
-to run unmodified, but this will also change in a future release.
+.. versionchanged:: 2.6
+ All exceptions to be raised or caught must be derived from :exc:`BaseException`.
+ Trying to raise a string exception now raises :exc:`TypeError`.