Mailman 3 September 2020 - Python-checkins

bpo-41858: Clarify line in optparse doc (GH-22407)
by Miss Islington (bot) Sept. 27, 2020

Sept. 27, 2020

https://github.com/python/cpython/commit/8b2595f68af059afdd61b2bb3d32a2bf4f… commit: 8b2595f68af059afdd61b2bb3d32a2bf4f1662c8 branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2020-09-26T21:03:56-07:00 summary: bpo-41858: Clarify line in optparse doc (GH-22407) The existing line is easily read as being incomplete. (cherry picked from commit 00eb063b6600fdb4ba5cfb99da83cc1660ec69bf) Co-… [View More]

1 0

bpo-41858: Clarify line in optparse doc (GH-22407)
by Miss Islington (bot) Sept. 27, 2020

Sept. 27, 2020

https://github.com/python/cpython/commit/e0e614ca99c39e107b97c7be779efea08f… commit: e0e614ca99c39e107b97c7be779efea08f22ace3 branch: 3.8 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2020-09-26T20:52:01-07:00 summary: bpo-41858: Clarify line in optparse doc (GH-22407) The existing line is easily read as being incomplete. (cherry picked from commit 00eb063b6600fdb4ba5cfb99da83cc1660ec69bf) Co-… [View More]

1 0

bpo-41858: Clarify line in optparse doc (GH-22407)
by Emmanuel Arias Sept. 27, 2020

Sept. 27, 2020

https://github.com/python/cpython/commit/00eb063b6600fdb4ba5cfb99da83cc1660… commit: 00eb063b6600fdb4ba5cfb99da83cc1660ec69bf branch: master author: Emmanuel Arias <eamanu(a)yaerobi.com> committer: GitHub <noreply(a)github.com> date: 2020-09-26T23:43:18-04:00 summary: bpo-41858: Clarify line in optparse doc (GH-22407) The existing line is easily read as being incomplete. files: M Doc/library/optparse.rst diff --git a/Doc/library/optparse.rst b/Doc/library/optparse.rst index … [View More]

1 0

Revert "Fix all Python Cookbook links (#22205)" (GH-22424)
by Andre Delfino Sept. 27, 2020

Sept. 27, 2020

https://github.com/python/cpython/commit/e8a2076e149703ea043db5a9dfaaf8d9b7… commit: e8a2076e149703ea043db5a9dfaaf8d9b7f37c3e branch: master author: Andre Delfino <adelfino(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2020-09-27T01:47:25+01:00 summary: Revert "Fix all Python Cookbook links (#22205)" (GH-22424) This commit reverts commit ac0333e1e117b7f61ed7ef1dbcdb6e515ada603b as the original links are working again and they provide extended features such as … [View More]

1 0

bpo-1635741: Port _bisect module to multi-phase init (GH-22415)
by Dong-hee Na Sept. 26, 2020

Sept. 26, 2020

https://github.com/python/cpython/commit/2afd1751dd9a35d4ec03b708e3e5cddd72… commit: 2afd1751dd9a35d4ec03b708e3e5cddd72c43f7e branch: master author: Dong-hee Na <donghee.na92(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2020-09-26T19:56:26+09:00 summary: bpo-1635741: Port _bisect module to multi-phase init (GH-22415) files: A Misc/NEWS.d/next/Core and Builtins/2020-09-26-14-43-30.bpo-1635741.aJS9B3.rst M Modules/_bisectmodule.c diff --git a/Misc/NEWS.d/next/Core … [View More]

1 0

bpo-41428: Fix compiler warning in unionobject.c (GH-22416)
by Victor Stinner Sept. 26, 2020

Sept. 26, 2020

https://github.com/python/cpython/commit/d73cf7ca85fb60b739e671597aabe72cc3… commit: d73cf7ca85fb60b739e671597aabe72cc36d397a branch: master author: Victor Stinner <vstinner(a)python.org> committer: GitHub <noreply(a)github.com> date: 2020-09-26T12:48:41+02:00 summary: bpo-41428: Fix compiler warning in unionobject.c (GH-22416) Use Py_ssize_t type rather than int, to store lengths in unionobject.c. Fix the warning: Objects\unionobject.c(205,1): warning C4244: 'initializing': … [View More]

1 0

Fix logging error message (GH-22410)
by Eric Larson Sept. 25, 2020

Sept. 25, 2020

https://github.com/python/cpython/commit/9fdb76c34c44ac27531229b72aa2aa424d… commit: 9fdb76c34c44ac27531229b72aa2aa424d10e846 branch: master author: Eric Larson <larson.eric.d(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2020-09-25T11:08:50-07:00 summary: Fix logging error message (GH-22410) Same changes as #22276 squashed to a single commit. Just hoping to get Travis to cooperate by opening a new PR... Automerge-Triggered-By: @vsajip files: M Lib/logging/… [View More]__init__.py M Lib/test/test_logging.py diff --git a/Lib/logging/__init__.py b/Lib/logging/__init__.py index 94361ca75f4f3..d8a88db378436 100644 --- a/Lib/logging/__init__.py +++ b/Lib/logging/__init__.py @@ -194,7 +194,8 @@ def _checkLevel(level): raise ValueError("Unknown level: %r" % level) rv = _nameToLevel[level] else: - raise TypeError("Level not an integer or a valid string: %r" % level) + raise TypeError("Level not an integer or a valid string: %r" + % (level,)) return rv #--------------------------------------------------------------------------- diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py index d23fbfb4fe281..4cd8c7e25daa9 100644 --- a/Lib/test/test_logging.py +++ b/Lib/test/test_logging.py @@ -3720,7 +3720,15 @@ def tzname(self, dt): utc = UTC() -class FormatterTest(unittest.TestCase): +class AssertErrorMessage: + + def assert_error_message(self, exception, message, *args, **kwargs): + try: + self.assertRaises((), *args, **kwargs) + except exception as e: + self.assertEqual(message, str(e)) + +class FormatterTest(unittest.TestCase, AssertErrorMessage): def setUp(self): self.common = { 'name': 'formatter.test', @@ -3744,12 +3752,6 @@ def get_record(self, name=None): result.update(self.variants[name]) return logging.makeLogRecord(result) - def assert_error_message(self, exception, message, *args, **kwargs): - try: - self.assertRaises(exception, *args, **kwargs) - except exception as e: - self.assertEqual(message, e.message) - def test_percent(self): # Test %-formatting r = self.get_record() @@ -3868,7 +3870,7 @@ def test_format_validate(self): # Testing failure for '-' in field name self.assert_error_message( ValueError, - "invalid field name/expression: 'name-thing'", + "invalid format: invalid field name/expression: 'name-thing'", logging.Formatter, "{name-thing}", style="{" ) # Testing failure for style mismatch @@ -3891,7 +3893,7 @@ def test_format_validate(self): # Testing failure for invalid spec self.assert_error_message( ValueError, - "bad specifier: '.2ff'", + "invalid format: bad specifier: '.2ff'", logging.Formatter, '{process:.2ff}', style='{' ) self.assertRaises(ValueError, logging.Formatter, '{process:.2Z}', style='{') @@ -3901,12 +3903,12 @@ def test_format_validate(self): # Testing failure for mismatch braces self.assert_error_message( ValueError, - "invalid format: unmatched '{' in format spec", + "invalid format: expected '}' before end of string", logging.Formatter, '{process', style='{' ) self.assert_error_message( ValueError, - "invalid format: unmatched '{' in format spec", + "invalid format: Single '}' encountered in format string", logging.Formatter, 'process}', style='{' ) self.assertRaises(ValueError, logging.Formatter, '{{foo!r:4.2}', style='{') @@ -4867,7 +4869,7 @@ def process(self, msg, kwargs): self.assertIs(self.logger.manager, orig_manager) -class LoggerTest(BaseTest): +class LoggerTest(BaseTest, AssertErrorMessage): def setUp(self): super(LoggerTest, self).setUp() @@ -4879,7 +4881,12 @@ def setUp(self): self.addCleanup(logging.shutdown) def test_set_invalid_level(self): - self.assertRaises(TypeError, self.logger.setLevel, object()) + self.assert_error_message( + TypeError, 'Level not an integer or a valid string: None', + self.logger.setLevel, None) + self.assert_error_message( + TypeError, 'Level not an integer or a valid string: (0, 0)', + self.logger.setLevel, (0, 0)) def test_exception(self): msg = 'testing exception: %r' [View Less]

1 0

bpo-39934: Account for control blocks in 'except' in compiler. (GH-22395)
by Mark Shannon Sept. 25, 2020

Sept. 25, 2020

https://github.com/python/cpython/commit/02d126aa09d96d03dcf9c5b51c858ce5ef… commit: 02d126aa09d96d03dcf9c5b51c858ce5ef386601 branch: master author: Mark Shannon <mark(a)hotpy.org> committer: GitHub <noreply(a)github.com> date: 2020-09-25T14:04:19+01:00 summary: bpo-39934: Account for control blocks in 'except' in compiler. (GH-22395) * Account for control blocks in 'except' in compiler. Fixes #39934. files: A Misc/NEWS.d/next/Core and Builtins/2020-09-24-12-15-45.bpo-39934.… [View More]YVHTCF.rst M Lib/test/test_syntax.py M Python/compile.c diff --git a/Lib/test/test_syntax.py b/Lib/test/test_syntax.py index 4657fd1c0d8a7..09c6eb3375409 100644 --- a/Lib/test/test_syntax.py +++ b/Lib/test/test_syntax.py @@ -950,6 +950,15 @@ def test_empty_line_after_linecont(self): except SyntaxError: self.fail("Empty line after a line continuation character is valid.") + @support.cpython_only + def test_nested_named_except_blocks(self): + code = "" + for i in range(12): + code += f"{' '*i}try:\n" + code += f"{' '*(i+1)}raise Exception\n" + code += f"{' '*i}except Exception as e:\n" + code += f"{' '*4*12}pass" + self._check_error(code, "too many statically nested blocks") def test_main(): support.run_unittest(SyntaxTestCase) diff --git a/Misc/NEWS.d/next/Core and Builtins/2020-09-24-12-15-45.bpo-39934.YVHTCF.rst b/Misc/NEWS.d/next/Core and Builtins/2020-09-24-12-15-45.bpo-39934.YVHTCF.rst new file mode 100644 index 0000000000000..92cd1ba234d21 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2020-09-24-12-15-45.bpo-39934.YVHTCF.rst @@ -0,0 +1,3 @@ +Correctly count control blocks in 'except' in compiler. Ensures that a +syntax error, rather a fatal error, occurs for deeply nested, named +exception handlers. diff --git a/Python/compile.c b/Python/compile.c index 0f9e5c276c7b7..f2563d7f7a411 100644 --- a/Python/compile.c +++ b/Python/compile.c @@ -108,8 +108,8 @@ It's called a frame block to distinguish it from a basic block in the compiler IR. */ -enum fblocktype { WHILE_LOOP, FOR_LOOP, EXCEPT, FINALLY_TRY, FINALLY_END, - WITH, ASYNC_WITH, HANDLER_CLEANUP, POP_VALUE }; +enum fblocktype { WHILE_LOOP, FOR_LOOP, TRY_EXCEPT, FINALLY_TRY, FINALLY_END, + WITH, ASYNC_WITH, HANDLER_CLEANUP, POP_VALUE, EXCEPTION_HANDLER }; struct fblockinfo { enum fblocktype fb_type; @@ -1623,9 +1623,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_SyntaxError, - "too many statically nested blocks"); - return 0; + return compiler_error(c, "too many statically nested blocks"); } f = &c->u->u_fblock[c->u->u_nfblocks++]; f->fb_type = t; @@ -1665,6 +1663,7 @@ compiler_unwind_fblock(struct compiler *c, struct fblockinfo *info, { switch (info->fb_type) { case WHILE_LOOP: + case EXCEPTION_HANDLER: return 1; case FOR_LOOP: @@ -1675,7 +1674,7 @@ compiler_unwind_fblock(struct compiler *c, struct fblockinfo *info, ADDOP(c, POP_TOP); return 1; - case EXCEPT: + case TRY_EXCEPT: ADDOP(c, POP_BLOCK); return 1; @@ -3060,14 +3059,17 @@ compiler_try_except(struct compiler *c, stmt_ty s) return 0; ADDOP_JUMP(c, SETUP_FINALLY, except); compiler_use_next_block(c, body); - if (!compiler_push_fblock(c, EXCEPT, body, NULL, NULL)) + if (!compiler_push_fblock(c, TRY_EXCEPT, body, NULL, NULL)) return 0; VISIT_SEQ(c, stmt, s->v.Try.body); ADDOP(c, POP_BLOCK); - compiler_pop_fblock(c, EXCEPT, body); + compiler_pop_fblock(c, TRY_EXCEPT, body); ADDOP_JUMP(c, JUMP_FORWARD, orelse); n = asdl_seq_LEN(s->v.Try.handlers); compiler_use_next_block(c, except); + /* Runtime will push a block here, so we need to account for that */ + if (!compiler_push_fblock(c, EXCEPTION_HANDLER, NULL, NULL, NULL)) + return 0; for (i = 0; i < n; i++) { excepthandler_ty handler = (excepthandler_ty)asdl_seq_GET( s->v.Try.handlers, i); @@ -3152,6 +3154,7 @@ compiler_try_except(struct compiler *c, stmt_ty s) } compiler_use_next_block(c, except); } + compiler_pop_fblock(c, EXCEPTION_HANDLER, NULL); ADDOP(c, RERAISE); compiler_use_next_block(c, orelse); VISIT_SEQ(c, stmt, s->v.Try.orelse); [View Less]

1 0

bpo-41775: Make 'IDLE Shell' the shell title (GH-22399)
by Miss Islington (bot) Sept. 24, 2020

Sept. 24, 2020

https://github.com/python/cpython/commit/18e59f587b86297d4fc99765be10d92a71… commit: 18e59f587b86297d4fc99765be10d92a717d4775 branch: 3.8 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2020-09-24T13:08:06-07:00 summary: bpo-41775: Make 'IDLE Shell' the shell title (GH-22399) 'Python Shell' may have contributed to some beginners confusing 'IDLE' with ' Python'. (cherry picked from commit … [View More]

1 0

bpo-41775: Make 'IDLE Shell' the shell title (GH-22399)
by Miss Islington (bot) Sept. 24, 2020

Sept. 24, 2020

https://github.com/python/cpython/commit/4080f12ccccb17cee36732758912dc4346… commit: 4080f12ccccb17cee36732758912dc4346ec9361 branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2020-09-24T13:07:49-07:00 summary: bpo-41775: Make 'IDLE Shell' the shell title (GH-22399) 'Python Shell' may have contributed to some beginners confusing 'IDLE' with ' Python'. (cherry picked from commit … [View More]

1 0