From: Benjamin Peterson <benjamin@python.org>
Date: Sun, 2 Sep 2012 18:24:44 +0000 (-0400)
Subject: merge 3.2 (#15846)
X-Git-Tag: v3.3.1rc1~818^2^2~153
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c7f447c89fdef7106089f16ea46d5f9341fa0858;p=thirdparty%2FPython%2Fcpython.git

merge 3.2 (#15846)
---

c7f447c89fdef7106089f16ea46d5f9341fa0858
diff --cc Misc/NEWS
index 2af87eed7b10,544bf67afb26..41732efeb052
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,8 -10,11 +10,11 @@@ What's New in Python 3.3.
  Core and Builtins
  -----------------
  
 +- Issue #15839: Convert SystemErrors in super() to RuntimeErrors.
 +
+ - Issue #15846: Fix SystemError which happened when using ast.parse in an
+   exception handler on code with syntax errors.
+ 
 -- Issue #15761: Fix crash when PYTHONEXECUTABLE is set on Mac OS X.
 -
  - Issue #15801: Make sure mappings passed to '%' formatting are actually
    subscriptable.