Skip to content
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

Jump to bottom

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

Merged
merged 4 commits into from
Nov 20, 2022
Merged

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

merged 4 commits into from
Nov 20, 2022

Conversation

lysnikolaou
Copy link
Contributor

@lysnikolaou lysnikolaou commented Nov 7, 2022 •
edited by miss-islington
Loading

@bedevere-bot bedevere-bot mentioned this pull request Nov 7, 2022
Closed
iritkatriel
iritkatriel reviewed Nov 7, 2022
View reviewed changes
Grammar/python.gram Outdated Show resolved Hide resolved
iritkatriel
iritkatriel approved these changes Nov 7, 2022
View reviewed changes
Copy link
Member

@iritkatriel iritkatriel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@iritkatriel iritkatriel added skip news 3.11 only security fixes 3.12 bugs and security fixes labels Nov 20, 2022
@iritkatriel
Copy link
Member

Added skip news because my PR had a news item that covers this (and is not too specific).

I think we should backport this to 3.11. Would you agree?

@lysnikolaou
Copy link
Contributor Author

lysnikolaou commented Nov 20, 2022 •
edited
Loading

I think we should backport this to 3.11. Would you agree?

Yup, I think it makes sense since #99160 was also backported.

@lysnikolaou
Copy link
Contributor Author

Also, I've pushed another change, so another quick review would be nice.

@iritkatriel iritkatriel added the needs backport to 3.11 only security fixes label Nov 20, 2022
@iritkatriel
Copy link
Member

LGTM, but I'm not a parser expert.

@miss-islington
Copy link
Contributor

Status check is done, and it's a success ✅.

@miss-islington miss-islington merged commit 9c4232a into python:main Nov 20, 2022
@miss-islington
Copy link
Contributor

Thanks @lysnikolaou for the PR 🌮🎉.. I'm working now to backport this PR to: 3.11.
🐍🍒⛏🤖

@miss-islington
Copy link
Contributor

Sorry, @lysnikolaou, I could not cleanly backport this to 3.11 due to a conflict.
Please backport using cherry_picker on command line.
cherry_picker 9c4232ae8972a33f84e875cfdd866318a1233e47 3.11

@miss-islington miss-islington self-assigned this Nov 20, 2022
@bedevere-bot
Copy link

GH-99622 is a backport of this pull request to the 3.11 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.11 only security fixes label Nov 20, 2022
lysnikolaou added a commit to lysnikolaou/cpython that referenced this pull request Nov 20, 2022
@lysnikolaou
pythongh-99211: Point to except/except* on syntax errors when mixing …
3a07421 
…them (pythonGH-99215)

Automerge-Triggered-By: GH:lysnikolaou
(cherry picked from commit 9c4232a)
lysnikolaou added a commit that referenced this pull request Nov 20, 2022
@lysnikolaou
[3.11] gh-99211: Point to except/except* on syntax errors when mixing…
152a437 
… them (GH-99215) (GH-99622)

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

(cherry picked from commit 9c4232a)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@iritkatriel iritkatriel iritkatriel approved these changes

@pablogsal pablogsal Awaiting requested review from pablogsal pablogsal is a code owner

Assignees

@miss-islington miss-islington

Labels
3.11 only security fixes 3.12 bugs and security fixes skip news
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@lysnikolaou @iritkatriel @miss-islington @bedevere-bot