make too many nested blocks be a SyntaxError instead of a SystemError (closes #27514)

Patch by Ammar Askar.
This commit is contained in:
Benjamin Peterson 2016-07-14 22:00:03 -07:00
parent 65e0d8ca65
commit 6c4fa70da6
3 changed files with 8 additions and 3 deletions

View File

@ -371,7 +371,9 @@ isn't, there should be a syntax error.
File "<doctest test.test_syntax[42]>", line 3
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
@ -399,7 +401,7 @@ build. The number of blocks must be greater than CO_MAXBLOCKS. SF #1565514
... break
Traceback (most recent call last):
...
SystemError: too many statically nested blocks
SyntaxError: too many statically nested blocks
This tests assignment-context; there was a bug in Python 2.5 where compiling
a complex 'if' (one with 'elif') would fail to notice an invalid suite,

View File

@ -17,6 +17,9 @@ Core and Builtins
unicode paths with embedded null character on Windows instead of silently
truncating them.
- Issue #27514: Make having too many statically nested blocks a SyntaxError
instead of SystemError.
Library
-------

View File

@ -3147,7 +3147,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;
}