From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 30 Oct 2013 02:25:55 +0000 (-0400)
Subject: merge 3.3
X-Git-Tag: v3.4.0b1~471
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=96c03df771199196f4580d4fd32f6cea902fb2ec;p=thirdparty%2FPython%2Fcpython.git

merge 3.3
---

96c03df771199196f4580d4fd32f6cea902fb2ec
diff --cc Python/ceval.c
index 5f49615872b6,73925dc41392..d4d8466e25d0
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@@ -2715,8 -2571,9 +2715,8 @@@ PyEval_EvalFrameEx(PyFrameObject *f, in
              DISPATCH();
          }
  
 -        TARGET(WITH_CLEANUP)
 -        {
 +        TARGET(WITH_CLEANUP) {
-             /* At the top of the stack are 1-3 values indicating
+             /* At the top of the stack are 1-6 values indicating
                 how/why we entered the finally clause:
                 - TOP = None
                 - (TOP, SECOND) = (WHY_{RETURN,CONTINUE}), retval