Skip to content

don't ignore ctrl-C during %gui qt - #1160

Merged
fperez merged 2 commits into
masterfrom
inputhookqt4
Dec 15, 2011
Merged

fperez merged 2 commits into
masterfrom
inputhookqt4

Conversation

@minrk

@minrk minrk commented Dec 15, 2011

Copy link
Copy Markdown
Member

See #1157

PR #815 ignores ctrl-C during normal code execution, this restores the sigint handler outside the inputhook.

fperez added a commit that referenced this pull request Dec 15, 2011
Don't ignore ctrl-C during `%gui qt`

PR #815 ignores ctrl-C during normal code execution, this restores the sigint handler outside the inputhook.

Closes #1157.
@fperez
fperez merged commit 464cb89 into master Dec 15, 2011
@fperez

fperez commented Dec 15, 2011

Copy link
Copy Markdown
Member

@cboos, just wanted to ping you on this one: we merged it after review on IRC and a fair amount of testing. We realize it may bring back some problem case you might know about and that we couldn't find, so please let us know if that's the case. But the complete breakage of C-C in master was bad enough that we had to do something to fix it; we're happy to fine-tune further if you know of other edge cases this causes problems with.

@cboos

cboos commented Dec 17, 2011

Copy link
Copy Markdown
Contributor

Thanks for the CC. The changes look good and a0e0692 was indeed a mistake from my part, the correct behavior should indeed be that CTRL+C is allowed outside of the inputhook (I probably did this silly mistake in an "afterthought", wanting to make it symmetric with the ignore_CTRL_C in the catch block, forgetting that the mgr.clear_inputhook() done just a bit later would reenable the CTRL_C). Your finally clause makes the intent clearer.

mattvonrocketstein pushed a commit to mattvonrocketstein/ipython that referenced this pull request Nov 3, 2014
Don't ignore ctrl-C during `%gui qt`

PR ipython#815 ignores ctrl-C during normal code execution, this restores the sigint handler outside the inputhook.

Closes ipython#1157.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants