Skip to content

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

Merged
pablogsal merged 2 commits into
python:mainfrom
skirpichev:exc-filename-122546
Aug 22, 2024
Merged

gh-122546: use same filename for different exceptions in new repl#123217
pablogsal merged 2 commits into
python:mainfrom
skirpichev:exc-filename-122546

Conversation

@skirpichev

@skirpichevskirpichev commented Aug 22, 2024•
edited by bedevere-app Bot
Loading

Copy link
Copy Markdown
Member

@bedevere-appbedevere-appBot mentioned this pull request Aug 22, 2024
Closed
@pablogsalpablogsal added the needs backport to 3.13 bugs and security fixes label Aug 22, 2024
@pablogsal

pablogsal commented Aug 22, 2024

Copy link
Copy Markdown
Member

Thanks for the PR @skirpichev 👌

@pablogsal
pablogsal merged commit 3d7b1a5 into python:mainAug 22, 2024
@miss-islington-app

miss-islington-appBot commented Aug 22, 2024

Copy link
Copy Markdown

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

@miss-islington-app

miss-islington-appBot commented Aug 22, 2024

Copy link
Copy Markdown

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

pablogsal commented Aug 22, 2024

Copy link
Copy Markdown
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

skirpichev commented Aug 22, 2024

Copy link
Copy Markdown
MemberAuthor

Could you prepare the back port following these instructions?

I'll try.

@cfbolz

cfbolz commented Aug 22, 2024

Copy link
Copy Markdown
Contributor

@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

bedevere-appBot commented Aug 22, 2024

Copy link
Copy Markdown

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

@bedevere-appbedevere-appBot removed the needs backport to 3.13 bugs and security fixes label Aug 22, 2024
@skirpichev

skirpichev commented Aug 22, 2024

Copy link
Copy Markdown
MemberAuthor

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 freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@pablogsalpablogsalpablogsal approved these changes
@lysnikolaoulysnikolaouAwaiting requested review from lysnikolaoulysnikolaou is a code owner
@ambvambvAwaiting requested review from ambvambv is a code owner

Assignees

@pablogsalpablogsal

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@skirpichev@pablogsal@cfbolz