diff options
| author | Sandro Tosi <sandro.tosi@gmail.com> | 2012-01-01 11:17:36 (GMT) |
|---|---|---|
| committer | Sandro Tosi <sandro.tosi@gmail.com> | 2012-01-01 11:17:36 (GMT) |
| commit | bc25dcf3f36b441e7708b1a62092d507ccebc8f7 (patch) | |
| tree | d3a0e4c5d656d9d3d0bde9f6c2f1a681df7b77dd /Doc/reference | |
| parent | 49890c06b652e2d63b0b2857e5b7266e4d07e437 (diff) | |
| parent | b2794c842f0e35af22387cfc74173d4ac22681b4 (diff) | |
| download | cpython-bc25dcf3f36b441e7708b1a62092d507ccebc8f7.zip cpython-bc25dcf3f36b441e7708b1a62092d507ccebc8f7.tar.gz cpython-bc25dcf3f36b441e7708b1a62092d507ccebc8f7.tar.bz2 | |
merge with 3.2
Diffstat (limited to 'Doc/reference')
| -rw-r--r-- | Doc/reference/simple_stmts.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Doc/reference/simple_stmts.rst b/Doc/reference/simple_stmts.rst index 0bf2127..34ed92f 100644 --- a/Doc/reference/simple_stmts.rst +++ b/Doc/reference/simple_stmts.rst @@ -495,8 +495,8 @@ The :keyword:`raise` statement If no expressions are present, :keyword:`raise` re-raises the last exception that was active in the current scope. If no exception is active in the current -scope, a :exc:`TypeError` exception is raised indicating that this is an error -(if running under IDLE, a :exc:`queue.Empty` exception is raised instead). +scope, a :exc:`RuntimeError` exception is raised indicating that this is an +error. Otherwise, :keyword:`raise` evaluates the first expression as the exception object. It must be either a subclass or an instance of :class:`BaseException`. |