summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2014-04-14 15:20:45 (GMT)
committerMark Dickinson <dickinsm@gmail.com>2014-04-14 15:20:45 (GMT)
commit393a2a0fe0b54f09c7d7f928efa5527e0e95a508 (patch)
tree9122fc4024af43ef118a3419c6fc487b6134c81b /Doc/library
parentce4d9c2f5180272f05d5ea65db07b2898a27ef28 (diff)
parentabf079de2556578a4250c671ddbb83e7399b3e1d (diff)
downloadcpython-393a2a0fe0b54f09c7d7f928efa5527e0e95a508.zip
cpython-393a2a0fe0b54f09c7d7f928efa5527e0e95a508.tar.gz
cpython-393a2a0fe0b54f09c7d7f928efa5527e0e95a508.tar.bz2
Issue #20624: Merge exception docs tweak from 3.4 branch.
Diffstat (limited to 'Doc/library')
-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 0642a13..45a6b1b 100644
--- a/Doc/library/exceptions.rst
+++ b/Doc/library/exceptions.rst
@@ -28,10 +28,10 @@ handler or to report an error condition "just like" the situation in which the
interpreter raises the same exception; but beware that there is nothing to
prevent user code from raising an inappropriate error.
-The built-in exception classes can be sub-classed to define new exceptions;
-programmers are encouraged to at least derive new exceptions from the
-:exc:`Exception` class and not :exc:`BaseException`. More information on
-defining exceptions is available in the Python Tutorial under
+The built-in exception classes can be subclassed to define new exceptions;
+programmers are encouraged to derive new exceptions from the :exc:`Exception`
+class or one of its subclasses, and not from :exc:`BaseException`. More
+information on defining exceptions is available in the Python Tutorial under
:ref:`tut-userexceptions`.
When raising (or re-raising) an exception in an :keyword:`except` clause