Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

gh-99211: Point to except/except* on syntax errors when mixing them (GH-99215) 

Automerge-Triggered-By: GH:lysnikolaou
This commit is contained in:
Lysandros Nikolaou 2022-11-20 18:11:02 +01:00 committed by GitHub
parent b0e1f9c241
commit 9c4232ae89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1018 additions and 974 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Grammar/python.gram
View File

@ -1254,7 +1254,9 @@ invalid_try_stmt:
| a='try' ':' NEWLINE !INDENT {
RAISE_INDENTATION_ERROR("expected an indented block after 'try' statement on line %d", a->lineno) }
| 'try' ':' block !('except' | 'finally') { RAISE_SYNTAX_ERROR("expected 'except' or 'finally' block") }
| a='try' ':' block* ((except_block+ except_star_block) | (except_star_block+ except_block)) block* {
| 'try' ':' block* except_block+ a='except' b='*' expression ['as' NAME] ':' {
RAISE_SYNTAX_ERROR_KNOWN_RANGE(a, b, "cannot have both 'except' and 'except*' on the same 'try'") }
| 'try' ':' block* except_star_block+ a='except' [expression ['as' NAME]] ':' {
RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "cannot have both 'except' and 'except*' on the same 'try'") }
invalid_except_stmt:
| 'except' '*'? a=expression ',' expressions ['as' NAME ] ':' {

4
Lib/test/test_syntax.py
View File

@ -2017,12 +2017,12 @@ class SyntaxTestCase(unittest.TestCase):
def test_except_then_except_star(self):
self._check_error("try: pass\nexcept ValueError: pass\nexcept* TypeError: pass",
r"cannot have both 'except' and 'except\*' on the same 'try'",
lineno=1, end_lineno=1, offset=1, end_offset=4)
lineno=3, end_lineno=3, offset=1, end_offset=8)
def test_except_star_then_except(self):
self._check_error("try: pass\nexcept* ValueError: pass\nexcept TypeError: pass",
r"cannot have both 'except' and 'except\*' on the same 'try'",
lineno=1, end_lineno=1, offset=1, end_offset=4)
lineno=3, end_lineno=3, offset=1, end_offset=7)
def test_empty_line_after_linecont(self):
# See issue-40847

1984
Parser/parser.c generated
View File

File diff suppressed because it is too large Load Diff