From: Georg Brandl <georg@python.org>
Date: Fri, 25 Feb 2011 11:19:59 +0000 (+0000)
Subject: #11317: fix wrong info about string exceptions.
X-Git-Tag: v2.7.2rc1~306
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2682661cbc3806f8388f915a2e815b9d9642e487;p=thirdparty%2FPython%2Fcpython.git

#11317: fix wrong info about string exceptions.
---

diff --git a/Doc/c-api/exceptions.rst b/Doc/c-api/exceptions.rst
index 3ed1313e4f53..e9ced0bdb0d9 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`.