summaryrefslogtreecommitdiffstats
path: root/Doc/c-api/exceptions.rst
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2007-09-01 12:33:24 (GMT)
committerGeorg Brandl <georg@python.org>2007-09-01 12:33:24 (GMT)
commit321976b6e74db8f649e47f2b791c4bcc2a71d127 (patch)
treef3553ef3dd5133f7a285bdd392a85d49c773749d /Doc/c-api/exceptions.rst
parent2326a79de134281b12b3ed04eeabcc8c403df57d (diff)
downloadcpython-321976b6e74db8f649e47f2b791c4bcc2a71d127.zip
cpython-321976b6e74db8f649e47f2b791c4bcc2a71d127.tar.gz
cpython-321976b6e74db8f649e47f2b791c4bcc2a71d127.tar.bz2
Remove versionadded and versionchanged directives, fold information into text where necessary.
Diffstat (limited to 'Doc/c-api/exceptions.rst')
-rw-r--r--Doc/c-api/exceptions.rst22
1 files changed, 1 insertions, 21 deletions
diff --git a/Doc/c-api/exceptions.rst b/Doc/c-api/exceptions.rst
index 68ac090..2148463 100644
--- a/Doc/c-api/exceptions.rst
+++ b/Doc/c-api/exceptions.rst
@@ -257,8 +257,6 @@ in various ways. There is a separate error indicator for each thread.
Similar to :cfunc:`PyErr_SetFromWindowsErr`, with an additional parameter
specifying the exception type to be raised. Availability: Windows.
- .. versionadded:: 2.3
-
.. cfunction:: PyObject* PyErr_SetFromWindowsErrWithFilename(int ierr, const char *filename)
@@ -272,8 +270,6 @@ in various ways. There is a separate error indicator for each thread.
Similar to :cfunc:`PyErr_SetFromWindowsErrWithFilename`, with an additional
parameter specifying the exception type to be raised. Availability: Windows.
- .. versionadded:: 2.3
-
.. cfunction:: void PyErr_BadInternalCall()
@@ -399,7 +395,7 @@ the variables:
+------------------------------------+----------------------------+----------+
| C Name | Python Name | Notes |
+====================================+============================+==========+
-| :cdata:`PyExc_BaseException` | :exc:`BaseException` | (1), (4) |
+| :cdata:`PyExc_BaseException` | :exc:`BaseException` | \(1) |
+------------------------------------+----------------------------+----------+
| :cdata:`PyExc_Exception` | :exc:`Exception` | \(1) |
+------------------------------------+----------------------------+----------+
@@ -497,19 +493,3 @@ Notes:
(3)
Only defined on Windows; protect code that uses this by testing that the
preprocessor macro ``MS_WINDOWS`` is defined.
-
-(4)
- .. 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 are still supported in the interpreter to allow existing code
-to run unmodified, but this will also change in a future release.
-