Mercurial > cpython-lru_cache-weakref
diff Doc/tutorial/errors.rst @ 55993:96b645752c33 2.6
Merged revisions 74825 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r74825 | ezio.melotti | 2009-09-16 16:14:05 +0300 (Wed, 16 Sep 2009) | 1 line
#6879 - fix misstatement about exceptions
........
| author | Ezio Melotti <ezio.melotti@gmail.com> |
|---|---|
| date | Wed, 16 Sep 2009 13:31:18 +0000 |
| parents | acc07866b233 |
| children | 66de7111230a |
line wrap: on
line diff
--- a/Doc/tutorial/errors.rst Tue Sep 15 19:14:37 2009 +0000 +++ b/Doc/tutorial/errors.rst Wed Sep 16 13:31:18 2009 +0000 @@ -221,10 +221,9 @@ File "<stdin>", line 1, in ? NameError: HiThere -The first argument to :keyword:`raise` names the exception to be raised. The -optional second argument specifies the exception's argument. Alternatively, the -above could be written as ``raise NameError('HiThere')``. Either form works -fine, but there seems to be a growing stylistic preference for the latter. +The sole argument to :keyword:`raise` indicates the exception to be raised. +This must be either an exception instance or an exception class (a class that +derives from :class:`Exception`). If you need to determine whether an exception was raised but don't intend to handle it, a simpler form of the :keyword:`raise` statement allows you to