Conversation
When Ctrl-C cancels click.prompt(), main() prints "Aborted!" via echo(), which probes isatty(). A second KeyboardInterrupt during that probe was not caught because isatty() only handled Exception, letting the interrupt escape and crash the process. Treat KeyboardInterrupt like other probe failures and return False. Fixes pallets#3802
Member
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Fixes #3802.
When a user cancels
click.prompt()with Ctrl-C, click converts theKeyboardInterrupttoAbortandmain()prints "Aborted!" viaecho(). That path callsshould_strip_ansi()→isatty(). A secondKeyboardInterruptarriving during theisatty()probe was not caught becauseisatty()only handledException, so the interrupt escapedmain()and crashed the process instead of exiting cleanly.isatty()to treatKeyboardInterruptlike other probe failures and returnFalse.prompt()→Abort→echo("Aborted!")path with aKeyboardInterruptraised insideisatty().Test plan
pytest tests/test_termui.py::test_prompt_abort_handles_keyboard_interrupt_during_abort_echopytest tests/test_termui.py(260 passed, 23 skipped)