summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2010-05-10 20:52:35 (GMT)
committerBenjamin Peterson <benjamin@python.org>2010-05-10 20:52:35 (GMT)
commitaec0127720b72884f87329396c6a31e4a02ce7ad (patch)
tree207c04bacea70d0ac7255a1c91947774047b3439
parent587cb1a2b27d2de9e2e6cb0819410a26e50da1ed (diff)
downloadcpython-aec0127720b72884f87329396c6a31e4a02ce7ad.zip
cpython-aec0127720b72884f87329396c6a31e4a02ce7ad.tar.gz
cpython-aec0127720b72884f87329396c6a31e4a02ce7ad.tar.bz2
Merged revisions 81057 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r81057 | benjamin.peterson | 2010-05-10 15:49:20 -0500 (Mon, 10 May 2010) | 1 line remove reference to second argument to raise #8676 ........
-rw-r--r--Doc/library/exceptions.rst8
1 files changed, 4 insertions, 4 deletions
diff --git a/Doc/library/exceptions.rst b/Doc/library/exceptions.rst
index 17a0fed..fb3ae94 100644
--- a/Doc/library/exceptions.rst
+++ b/Doc/library/exceptions.rst
@@ -28,10 +28,10 @@ The built-in exceptions listed below can be generated by the interpreter or
built-in functions. Except where mentioned, they have an "associated value"
indicating the detailed cause of the error. This may be a string or a tuple
containing several items of information (e.g., an error code and a string
-explaining the code). The associated value is the second argument to the
-:keyword:`raise` statement. If the exception class is derived from the standard
-root class :exc:`BaseException`, the associated value is present as the
-exception instance's :attr:`args` attribute.
+explaining the code). The associated value is usually passed to the exception
+class's constructor. If the exception class is derived from the standard root
+class :exc:`BaseException`, the associated value is present as the exception
+instance's :attr:`args` attribute.
User code can raise built-in exceptions. This can be used to test an exception
handler or to report an error condition "just like" the situation in which the