Skip to content

Accept unparenthesized exception groups in except clauses (PEP 758) #142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
karpovantonme wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Accept unparenthesized exception groups in except clauses (PEP 758) #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions parser/src/parser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -863,6 +863,24 @@ except OSError as e:
insta::assert_debug_snapshot!(parse_ast);
}

#[test]
fn test_try_unparenthesized_except_group() {
let parse_ast = ast::Suite::parse(
r#"try:
raise ValueError(1)
except TypeError, OSError:
print('caught')

try:
raise ExceptionGroup('eg', [KeyError()])
except* KeyError, IndexError:
print('caught')"#,
"<test>",
)
.unwrap();
insta::assert_debug_snapshot!(parse_ast);
}

#[test]
fn test_try_star() {
let parse_ast = ast::Suite::parse(
Expand Down
9 changes: 7 additions & 2 deletions parser/src/python.lalrpop
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -878,7 +878,8 @@ TryStatement: ast::Stmt = {
};

ExceptStarClause: ast::ExceptHandler = {
<location:@L> "except" "*" <typ:Test<"all">> ":" <body:Suite> => {
// PEP 758 covers `except*` too.
<location:@L> "except" "*" <typ:GenericList<Test<"all">>> ":" <body:Suite> => {
let end_location = body.last().unwrap().end();
ast::ExceptHandler::ExceptHandler(
ast::ExceptHandlerExceptHandler {
Expand All @@ -904,7 +905,11 @@ ExceptStarClause: ast::ExceptHandler = {


ExceptClause: ast::ExceptHandler = {
<location:@L> "except" <typ:Test<"all">?> ":" <body:Suite> => {
// PEP 758: several exception types without parentheses, as long as there
// is no `as` clause. `GenericList` already collapses a single element to
// itself and wraps the rest in a tuple, which is exactly the shape CPython
// produces for `except A, B:`.
<location:@L> "except" <typ:GenericList<Test<"all">>?> ":" <body:Suite> => {
let end_location = body.last().unwrap().end();
ast::ExceptHandler::ExceptHandler(
ast::ExceptHandlerExceptHandler {
Expand Down
Loading
Loading