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

[sandro.tosi]

http://hg.python.org/cpython/rev/8633cf8e8b20
changeset:   74220:8633cf8e8b20
parent:      74218:0780b7c3d231
parent:      74219:420e01156272
user:        Sandro Tosi <sandro.tosi at gmail.com>
date:        Sun Jan 01 12:17:36 2012 +0100
summary:
  merge with 3.2

files:
  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
--- a/Doc/reference/simple_stmts.rst
+++ b/Doc/reference/simple_stmts.rst
@@ -495,8 +495,8 @@
 
 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`.

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