FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

gh-74112: IDLE: Fix blocking function ignore SIGINT by mlouielu · Pull Request #2466 · python/cpython · GitHub

  1. python
  2. cpython

Repository navigation

gh-74112: IDLE: Fix blocking function ignore SIGINT #2466

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

Closed
mlouielu wants to merge 5 commits into from
Conversation 6 Commits 5 Checks 0 Files changed
Closed

gh-74112: IDLE: Fix blocking function ignore SIGINT #2466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7ce3928
bpo-29926: IDLE: Fix blocking function ignore SIGINT
mlouielu Jun 28, 2017
a1b5a2e
Update run.py
terryjreedy Jan 25, 2021
b54d8b6
Merge branch 'main' into int-unix
arhadthedev Feb 3, 2023
cdbad97
Add a NEWS entry
arhadthedev Feb 3, 2023
5580461
Merge branch 'main' into int-unix
arhadthedev Feb 3, 2023
File filter

Filter by extension

Filter by extension .py  (1) .rst  (1) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
18 changes: 17 additions & 1 deletion Lib/idlelib/run.py
Show comments
View file
Open in desktop
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
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import linecache
import queue
import sys
import signal
import textwrap
import time
import traceback
Expand Down Expand Up @@ -106,6 +107,7 @@ def handle_tk_events(tcl=tcl):
exit_now = False
quitting = False
interruptable = False
finish = False

def main(del_exitfunc=False):
"""Start the Python execution server in a subprocess
Expand All @@ -128,6 +130,8 @@ def main(del_exitfunc=False):
global exit_now
global quitting
global no_exitfunc
global main_thread
main_thread = threading.get_ident()
no_exitfunc = del_exitfunc
#time.sleep(15) # test subprocess not responding
try:
Expand Down Expand Up @@ -570,9 +574,10 @@ def __init__(self, rpchandler):
self.locals = {}

def runcode(self, code):
global interruptable
global interruptable, finish
try:
self.user_exc_info = None
finish = False
interruptable = True
try:
exec(code, self.locals)
Expand Down Expand Up @@ -601,11 +606,22 @@ def runcode(self, code):
self.rpchandler.interp.open_remote_stack_viewer()
else:
flush_stdout()
finally:
finish = True

def interrupt_the_server(self):
if interruptable:
thread.interrupt_main()

# See issue 29926, fallback when interrupt_main doesn't work
def _interrupt_by_signal_pthread():
if not finish:
try:
signal.pthread_kill(main_thread, signal.SIGINT)
except AttributeError:
pass
threading.Timer(0.2, _interrupt_by_signal_pthread).start()

def start_the_debugger(self, gui_adap_oid):
return debugger_r.start_debugger(self.rpchandler, gui_adap_oid)

Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/IDLE/2023-02-03-13-39-00.gh-issue-74112.9tqu39.rst
Show comments
View file
Open in desktop
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
Show hidden characters
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
IDLE Shell no longer ignores Ctrl+C when an interpreter waits on a
blocking function. Patch by Louie Lu.
Back | FazBrowse Home | New Git URL