[Python-checkins] cpython (merge default -> default): Merge

[michael.foord]

http://hg.python.org/cpython/rev/1d7bd04ab6dd
changeset:   90253:1d7bd04ab6dd
parent:      90252:34687e01543f
parent:      90249:262204877004
user:        Michael Foord <michael at voidspace.org.uk>
date:        Mon Apr 14 11:25:15 2014 -0400
summary:
  Merge

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
@@ -28,10 +28,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`.
 
 When raising (or re-raising) an exception in an :keyword:`except` clause

-- 
Repository URL: http://hg.python.org/cpython