[Python-checkins] r88571 - python/branches/release27-maint/Doc/c-api/exceptions.rst

[georg.brandl]

Author: georg.brandl
Date: Fri Feb 25 12:19:59 2011
New Revision: 88571

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

Modified:
   python/branches/release27-maint/Doc/c-api/exceptions.rst

Modified: python/branches/release27-maint/Doc/c-api/exceptions.rst
==============================================================================
--- python/branches/release27-maint/Doc/c-api/exceptions.rst	(original)
+++ python/branches/release27-maint/Doc/c-api/exceptions.rst	Fri Feb 25 12:19:59 2011
@@ -610,14 +610,10 @@
    .. versionadded:: 2.5
 
 
-Deprecation of String Exceptions
-================================
+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 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`.