From 6c4fa70da66d7efbf838a93bc69c7bdf2dda65f8 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 7994fe67e72..0a61462a608 100644 --- a/Lib/test/test_syntax.py +++ b/Lib/test/test_syntax.py @@ -371,7 +371,9 @@ isn't, there should be a syntax error. File "", 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, diff --git a/Misc/NEWS b/Misc/NEWS index 9ae2221c7db..7e762e88539 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -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 ------- diff --git a/Python/compile.c b/Python/compile.c index ba93fb4bdc7..9c9b2369852 100644 --- a/Python/compile.c +++ b/Python/compile.c @@ -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; }