From: Benjamin Peterson <benjamin@python.org>
Date: Fri, 15 Jul 2016 05:02:09 +0000 (-0700)
Subject: merge 3.5 (#27514)
X-Git-Tag: v3.6.0a4~176
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ce7b27d169f0d8383f99e0b73d6057aae6470e27;p=python

merge 3.5 (#27514)
---

ce7b27d169f0d8383f99e0b73d6057aae6470e27
diff --cc Misc/NEWS
index 02b0782ba6,f10544c381..de7c09c3c9
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -10,24 -10,9 +10,27 @@@ What's New in Python 3.6.0 alpha 
  Core and Builtins
  -----------------
  
+ - Issue #27514: Make having too many statically nested blocks a SyntaxError
+   instead of SystemError.
+ 
 +Library
 +-------
 +
 +Tests
 +-----
 +
 +- Issue #27369: In test_pyexpat, avoid testing an error message detail that
 +  changed in Expat 2.2.0.
 +
 +
 +What's New in Python 3.6.0 alpha 3
 +==================================
 +
 +*Release date: 2016-07-11*
 +
 +Core and Builtins
 +-----------------
 +
  - Issue #27473: Fixed possible integer overflow in bytes and bytearray
    concatenations.  Patch by Xiang Zhang.