summaryrefslogtreecommitdiffstats
path: root/Doc/library/exceptions.rst
diff options
context:
space:
mode:
authorMark Dickinson <dickinsm@gmail.com>2014-04-14 15:33:46 (GMT)
committerMark Dickinson <dickinsm@gmail.com>2014-04-14 15:33:46 (GMT)
commitf10cc46ad73861ac4fd901d65647fd862432be35 (patch)
treea7b5d4d7225bef9d4512e539c086db212dff9128 /Doc/library/exceptions.rst
parent9a55cd885746f03a2df38e84a7698cb3348c6be0 (diff)
downloadcpython-f10cc46ad73861ac4fd901d65647fd862432be35.zip
cpython-f10cc46ad73861ac4fd901d65647fd862432be35.tar.gz
cpython-f10cc46ad73861ac4fd901d65647fd862432be35.tar.bz2
Issue #20624: Merge exception docs tweak from 3.4 branch.
Diffstat (limited to 'Doc/library/exceptions.rst')
-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 9943b9a..9291c18 100644
--- a/Doc/library/exceptions.rst
+++ b/Doc/library/exceptions.rst
@@ -38,10 +38,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`.
The following exceptions are only used as base classes for other exceptions.