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-122546: use same filename for different exceptions in new repl #123217

Merged
merged 2 commits into from
Aug 22, 2024
Merged

gh-122546: use same filename for different exceptions in new repl #123217

merged 2 commits into from
Aug 22, 2024

Conversation

skirpichev
Copy link
Member

@skirpichev skirpichev commented Aug 22, 2024 •
edited by bedevere-app bot
Loading

@bedevere-app bedevere-app bot mentioned this pull request Aug 22, 2024
Closed
@pablogsal pablogsal added the needs backport to 3.13 bugs and security fixes label Aug 22, 2024
@pablogsal
Copy link
Member

Thanks for the PR @skirpichev 👌

@pablogsal pablogsal merged commit 3d7b1a5 into python:main Aug 22, 2024
45 checks passed
@miss-islington-app
Copy link

Thanks @skirpichev for the PR, and @pablogsal for merging it 🌮🎉.. I'm working now to backport this PR to: 3.13.
🐍🍒⛏🤖

@miss-islington-app
Copy link

Sorry, @skirpichev and @pablogsal, I could not cleanly backport this to 3.13 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 3d7b1a526d858496add5b188c790b8d5fe73b06b 3.13

@pablogsal
Copy link
Member

Sorry, @skirpichev and @pablogsal, I could not cleanly backport this to 3.13 due to a conflict. Please backport using cherry_picker on command line.

cherry_picker 3d7b1a526d858496add5b188c790b8d5fe73b06b 3.13

Could you prepare the back port following these instructions?

@skirpichev skirpichev deleted the exc-filename-122546 branch August 22, 2024 12:03
@skirpichev
Copy link
Member Author

Could you prepare the back port following these instructions?

I'll try.

@cfbolz
Copy link
Contributor

cfbolz commented Aug 22, 2024

@skirpichev hold off for a moment. there are various missing other backports which cause the automated backport failures, this one: #122817 and this one: #123062

skirpichev added a commit to skirpichev/cpython that referenced this pull request Aug 22, 2024
@skirpichev
[3.13] pythongh-122546: use same filename for different exceptions in…
32bb0f0 
… new repl (pythonGH-123217)

* pythongh-122546: use same filename for different exceptions in new repl

* +1
(cherry picked from commit 3d7b1a5)

Co-authored-by: Sergey B Kirpichev <skirpichev@gmail.com>
@bedevere-app
Copy link

bedevere-app bot commented Aug 22, 2024

GH-123226 is a backport of this pull request to the 3.13 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.13 bugs and security fixes label Aug 22, 2024
@skirpichev
Copy link
Member Author

Opened as a draft, just in case it may block other backports.

pablogsal pushed a commit that referenced this pull request Aug 22, 2024
@skirpichev
[3.13] gh-122546: use same filename for different exceptions in new r…
5271f8f 
…epl (GH-123217) (#123226)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pablogsal pablogsal pablogsal approved these changes

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

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

Assignees

@pablogsal pablogsal

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@skirpichev @pablogsal @cfbolz