[Python-checkins] cpython (2.7): Issue #20624: Merge exception docs tweak from 3.4 branch.

Mon Apr 14 17:34:04 CEST 2014

http://hg.python.org/cpython/rev/f729a0e90c4f
changeset: 90255:f729a0e90c4f
branch: 2.7
parent: 90250:520ce42ba2b8
user: Mark Dickinson <dickinsm at gmail.com>
date: Mon Apr 14 11:33:46 2014 -0400
summary:
 Issue #20624: Merge exception docs tweak from 3.4 branch.
files:
 Doc/library/exceptions.rst | 8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Doc/library/exceptions.rst b/Doc/library/exceptions.rst
--- a/Doc/library/exceptions.rst
+++ b/Doc/library/exceptions.rst
@@ -38,10 +38,10 @@
 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.
-- 
Repository URL: http://hg.python.org/cpython
