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

[zach.ware]

http://hg.python.org/cpython/rev/ec609d498566
changeset:   90572:ec609d498566
parent:      90569:685f92aad1dc
parent:      90571:b4b10afd2fe6
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Tue May 06 09:19:16 2014 -0500
summary:
  Merge with 3.4

files:
  Doc/reference/compound_stmts.rst |  16 ++++++++--------
  1 files changed, 8 insertions(+), 8 deletions(-)


diff --git a/Doc/reference/compound_stmts.rst b/Doc/reference/compound_stmts.rst
--- a/Doc/reference/compound_stmts.rst
+++ b/Doc/reference/compound_stmts.rst
@@ -313,14 +313,14 @@
 If the :keyword:`finally` clause executes a :keyword:`return` or :keyword:`break`
 statement, the saved exception is discarded::
 
-    def f():
-        try:
-            1/0
-        finally:
-            return 42
-
-    >>> f()
-    42
+   >>> def f():
+   ...     try:
+   ...         1/0
+   ...     finally:
+   ...         return 42
+   ...
+   >>> f()
+   42
 
 The exception information is not available to the program during execution of
 the :keyword:`finally` clause.

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