merge with 3.2

This commit is contained in:
Sandro Tosi 2012-01-01 12:17:36 +01:00
commit bc25dcf3f3

View file

@ -495,8 +495,8 @@ The :keyword:`raise` statement
If no expressions are present, :keyword:`raise` re-raises the last exception 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 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 scope, a :exc:`RuntimeError` exception is raised indicating that this is an
(if running under IDLE, a :exc:`queue.Empty` exception is raised instead). error.
Otherwise, :keyword:`raise` evaluates the first expression as the exception Otherwise, :keyword:`raise` evaluates the first expression as the exception
object. It must be either a subclass or an instance of :class:`BaseException`. object. It must be either a subclass or an instance of :class:`BaseException`.