Commit152a437

authored

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

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

1 parent56a517e commit152a437Copy full SHA for 152a437

File tree

+718

-674

lines changed

+718

-674

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1247,7 +1247,9 @@ invalid_try_stmt:`
`1247`	`1247`	`\| a='try' ':' NEWLINE !INDENT {`
`1248`	`1248`	`RAISE_INDENTATION_ERROR("expected an indented block after 'try' statement on line %d", a->lineno) }`
`1249`	`1249`	`\| 'try' ':' block !('except' \| 'finally') { RAISE_SYNTAX_ERROR("expected 'except' or 'finally' block") }`
`1250`		`- \| a='try' ':' block* ((except_block+ except_star_block) \| (except_star_block+ except_block)) block* {`
	`1250`	`+ \| 'try' ':' block* except_block+ a='except' b='*' expression ['as' NAME] ':' {`
	`1251`	`+ RAISE_SYNTAX_ERROR_KNOWN_RANGE(a, b, "cannot have both 'except' and 'except*' on the same 'try'") }`
	`1252`	`+ \| 'try' ':' block* except_star_block+ a='except' [expression ['as' NAME]] ':' {`
`1251`	`1253`	`RAISE_SYNTAX_ERROR_KNOWN_LOCATION(a, "cannot have both 'except' and 'except*' on the same 'try'") }`
`1252`	`1254`	`invalid_except_stmt:`
`1253`	`1255`	`\| 'except' '*'? a=expression ',' expressions ['as' NAME ] ':' {`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1988,12 +1988,12 @@ def test_generator_in_function_call(self):`
`1988`	`1988`	`deftest_except_then_except_star(self):`
`1989`	`1989`	`self._check_error("try: pass\nexcept ValueError: pass\nexcept* TypeError: pass",`
`1990`	`1990`	`r"cannot have both 'except' and 'except\*' on the same 'try'",`
`1991`		`-lineno=1,end_lineno=1,offset=1,end_offset=4)`
	`1991`	`+lineno=3,end_lineno=3,offset=1,end_offset=8)`
`1992`	`1992`
`1993`	`1993`	`deftest_except_star_then_except(self):`
`1994`	`1994`	`self._check_error("try: pass\nexcept* ValueError: pass\nexcept TypeError: pass",`
`1995`	`1995`	`r"cannot have both 'except' and 'except\*' on the same 'try'",`
`1996`		`-lineno=1,end_lineno=1,offset=1,end_offset=4)`
	`1996`	`+lineno=3,end_lineno=3,offset=1,end_offset=7)`
`1997`	`1997`
`1998`	`1998`	`deftest_empty_line_after_linecont(self):`
`1999`	`1999`	`# See issue-40847`

Comments

(0)