merge 3.5 (#27514)

benjaminp · benjaminp · commit ce7b27d169f0 · 2016-07-14T22:02:09.000-07:00
diff --git a/Lib/test/test_syntax.py b/Lib/test/test_syntax.py
@@ -334,7 +334,9 @@
      ...
    SyntaxError: 'break' outside loop
 
-This should probably raise a better error than a SystemError (or none at all).
+This raises a SyntaxError, it used to raise a SystemError.
+Context for this change can be found on issue #27514
+
 In 2.5 there was a missing exception and an assert was triggered in a debug
 build.  The number of blocks must be greater than CO_MAXBLOCKS.  SF #1565514
 
@@ -362,7 +364,7 @@
    ...                      break
    Traceback (most recent call last):
      ...
-   SystemError: too many statically nested blocks
+   SyntaxError: too many statically nested blocks
 
 Misuse of the nonlocal statement can lead to a few unique syntax errors.
 
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -10,6 +10,9 @@ What's New in Python 3.6.0 alpha 4
 Core and Builtins
 -----------------
 
+- Issue #27514: Make having too many statically nested blocks a SyntaxError
+  instead of SystemError.
+
 Library
 -------
 
diff --git a/Python/compile.c b/Python/compile.c
@@ -4249,7 +4249,7 @@ compiler_push_fblock(struct compiler *c, enum fblocktype t, basicblock *b)
 {
     struct fblockinfo *f;
     if (c->u->u_nfblocks >= CO_MAXBLOCKS) {
-        PyErr_SetString(PyExc_SystemError,
+        PyErr_SetString(PyExc_SyntaxError,
                         "too many statically nested blocks");
         return 0;
     }

Original file line number	Diff line number	Diff line change
`@@ -4249,7 +4249,7 @@ compiler_push_fblock(struct compiler c, enum fblocktype t, basicblock b)`
`4249`	`4249`	`{`
`4250`	`4250`	`struct fblockinfo *f;`
`4251`	`4251`	`if (c->u->u_nfblocks >= CO_MAXBLOCKS) {`
`4252`		`- PyErr_SetString(PyExc_SystemError,`
	`4252`	`+ PyErr_SetString(PyExc_SyntaxError,`
`4253`	`4253`	`"too many statically nested blocks");`
`4254`	`4254`	`return 0;`
`4255`	`4255`	`}`