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-87320: dont crash in code module with bad sys.excepthook #122456

Merged
merged 6 commits into from
Jul 31, 2024
Merged

gh-87320: dont crash in code module with bad sys.excepthook #122456

merged 6 commits into from
Jul 31, 2024

Conversation

cfbolz
Copy link
Contributor

@cfbolz cfbolz commented Jul 30, 2024 •
edited by bedevere-app bot
Loading

Catch errors in code.InteractiveCodeInterpreter when calling sys.excepthook fails. Report them in the same style that the classic interpreter has reported them.

@bedevere-app bedevere-app bot mentioned this pull request Jul 30, 2024
Closed
serhiy-storchaka
serhiy-storchaka reviewed Jul 30, 2024
View reviewed changes
@cfbolz cfbolz mentioned this pull request Jul 30, 2024
Open
serhiy-storchaka
serhiy-storchaka approved these changes Jul 30, 2024
View reviewed changes
Copy link
Member

@serhiy-storchaka serhiy-storchaka left a comment

Choose a reason for hiding this comment

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

LGTM.

@serhiy-storchaka serhiy-storchaka enabled auto-merge (squash) July 31, 2024 10:32
@serhiy-storchaka serhiy-storchaka added needs backport to 3.12 bug and security fixes needs backport to 3.13 bugs and security fixes labels Jul 31, 2024
@serhiy-storchaka serhiy-storchaka merged commit bd3d31f into python:main Jul 31, 2024
36 checks passed
@miss-islington-app
Copy link

Thanks @cfbolz for the PR, and @serhiy-storchaka for merging it 🌮🎉.. I'm working now to backport this PR to: 3.12, 3.13.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jul 31, 2024
@cfbolz @miss-islington
pythongh-87320: In the code module, handle exceptions raised in sys.e…
c16e09b 
…xcepthook (pythonGH-122456)

Before, the exception caused by calling non-default sys.excepthook
in code.InteractiveInterpreter bubbled up to the caller, ending the REPL.
(cherry picked from commit bd3d31f)

Co-authored-by: CF Bolz-Tereick <cfbolz@gmx.de>
@miss-islington-app
Copy link

Sorry, @cfbolz and @serhiy-storchaka, I could not cleanly backport this to 3.12 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker bd3d31f380cd451a4ab6da5fbfde463fed95b5b5 3.12

@bedevere-app
Copy link

bedevere-app bot commented Jul 31, 2024

GH-122514 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 Jul 31, 2024
@serhiy-storchaka
Copy link
Member

Thank you for your contribution @cfbolz. Your responses were very quick and of high quality.

serhiy-storchaka pushed a commit to serhiy-storchaka/cpython that referenced this pull request Jul 31, 2024
@cfbolz @serhiy-storchaka
[3.12] pythongh-87320: In the code module, handle exceptions raised i…
435f66a 
…n sys.excepthook (pythonGH-122456)

Before, the exception caused by calling non-default sys.excepthook
in code.InteractiveInterpreter bubbled up to the caller, ending the REPL.
(cherry picked from commit bd3d31f)

Co-authored-by: CF Bolz-Tereick <cfbolz@gmx.de>
@bedevere-app
Copy link

bedevere-app bot commented Jul 31, 2024

GH-122515 is a backport of this pull request to the 3.12 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.12 bug and security fixes label Jul 31, 2024
@cfbolz
Copy link
Contributor Author

cfbolz commented Jul 31, 2024

@serhiy-storchaka thanks a lot for the review and your help!

serhiy-storchaka added a commit that referenced this pull request Jul 31, 2024
@serhiy-storchaka @cfbolz
[3.12] gh-87320: In the code module, handle exceptions raised in sys.…
5377f55 
…excepthook (GH-122456) (GH-122515)

Before, the exception caused by calling non-default sys.excepthook
in code.InteractiveInterpreter bubbled up to the caller, ending the REPL.
(cherry picked from commit bd3d31f)

Co-authored-by: CF Bolz-Tereick <cfbolz@gmx.de>
serhiy-storchaka pushed a commit that referenced this pull request Aug 8, 2024
@miss-islington @cfbolz
[3.13] gh-87320: In the code module, handle exceptions raised in sys.…
84c8cd0 
…excepthook (GH-122456) (GH-122514)

Before, the exception caused by calling non-default sys.excepthook
in code.InteractiveInterpreter bubbled up to the caller, ending the REPL.
(cherry picked from commit bd3d31f)

Co-authored-by: CF Bolz-Tereick <cfbolz@gmx.de>
blhsing pushed a commit to blhsing/cpython that referenced this pull request Aug 22, 2024
@cfbolz @blhsing
pythongh-87320: In the code module, handle exceptions raised in sys.e…
0be7553 
…xcepthook (pythonGH-122456)

Before, the exception caused by calling non-default sys.excepthook
in code.InteractiveInterpreter bubbled up to the caller, ending the REPL.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@skirpichev skirpichev skirpichev left review comments

@serhiy-storchaka serhiy-storchaka serhiy-storchaka approved these changes

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

@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

@serhiy-storchaka serhiy-storchaka

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@cfbolz @serhiy-storchaka @skirpichev