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 2b8792137b
commit e09ed5419b
3 changed files with 8 additions and 3 deletions

View File

@ -342,7 +342,9 @@ isn't, there should be a syntax error.
...
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
@ -370,7 +372,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
Misuse of the nonlocal statement can lead to a few unique syntax errors.

View File

@ -10,6 +10,9 @@ Release date: TBA
Core and Builtins
-----------------
- Issue #27514: Make having too many statically nested blocks a SyntaxError
instead of SystemError.
- Issue #27473: Fixed possible integer overflow in bytes and bytearray
concatenations. Patch by Xiang Zhang.

View File

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