From e09ed5419b84040a6f5d74ec9a3ae4fd9b4bc0e5 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Thu, 14 Jul 2016 22:00:03 -0700 Subject: [PATCH] make too many nested blocks be a SyntaxError instead of a SystemError (closes #27514) Patch by Ammar Askar. --- Lib/test/test_syntax.py | 6 ++++-- Misc/NEWS | 3 +++ Python/compile.c | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_syntax.py b/Lib/test/test_syntax.py index 057441c83c0..83f49f65802 100644 --- a/Lib/test/test_syntax.py +++ b/Lib/test/test_syntax.py @@ -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. diff --git a/Misc/NEWS b/Misc/NEWS index 835304b5f98..f10544c381c 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -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. diff --git a/Python/compile.c b/Python/compile.c index ce510aa7312..93f47e0220f 100644 --- a/Python/compile.c +++ b/Python/compile.c @@ -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; }