]> granicus.if.org Git - python/commitdiff
merge 3.5 (#27514)
authorBenjamin Peterson <benjamin@python.org>
Fri, 15 Jul 2016 05:02:09 +0000 (22:02 -0700)
committerBenjamin Peterson <benjamin@python.org>
Fri, 15 Jul 2016 05:02:09 +0000 (22:02 -0700)
1  2 
Lib/test/test_syntax.py
Misc/NEWS
Python/compile.c

Simple merge
diff --cc Misc/NEWS
index 02b0782ba6a0e3edb054925fc6ce30e7a2cae0cf,f10544c381cce4c4e459c7797f3098c7d0fff86c..de7c09c3c98e930d622a981d6a2226d06a7715d6
+++ 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.
  
Simple merge