On OpenBSD, terminating IDLE with ctrl-c from the command line caused a

stuck subprocess MainThread because only the SocketThread was exiting.

M NEWS.txt
M idlever.py
M run.py

diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index 3ca573d0d1aa60760ae533c3e4e29f0cdf92f403..1a3a35485f56ace14170e99962e9d0fc281ca2ce 100644 (file)
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -1,3 +1,11 @@
+What's New in IDLE 1.1rc2?
+=============================
+
+*Release date: XX-NOV-2004*
+
+- On OpenBSD, terminating IDLE with ctrl-c from the command line caused a
+  stuck subprocess MainThread because only the SocketThread was exiting.
+
 What's New in IDLE 1.1b3/rc1?
 =============================
 

diff --git a/Lib/idlelib/idlever.py b/Lib/idlelib/idlever.py
index d4d8295dc63be60a72a739cbe2fd94adf95c86b3..f185175c2880fa6e6a933be79e7992590b896615 100644 (file)
--- a/Lib/idlelib/idlever.py
+++ b/Lib/idlelib/idlever.py
@@ -1 +1 @@
-IDLE_VERSION = "1.1c1"
+IDLE_VERSION = "1.1c2"

diff --git a/Lib/idlelib/run.py b/Lib/idlelib/run.py
index 98b8c13030ecdfee1ad2256eb3ab172be84b533b..90a46922c6e86e0d8b4a0ad54f018e9afd67ba81 100644 (file)
--- a/Lib/idlelib/run.py
+++ b/Lib/idlelib/run.py
@@ -215,6 +215,7 @@ class MyRPCServer(rpc.RPCServer):
         Interrupt the MainThread and exit server if link is dropped.
 
         """
+        global quitting
         try:
             raise
         except SystemExit:
@@ -233,7 +234,8 @@ class MyRPCServer(rpc.RPCServer):
             traceback.print_exc(file=erf)
             print>>erf, '\n*** Unrecoverable, server exiting!'
             print>>erf, '-'*40
-            exit()
+            quitting = True
+            thread.interrupt_main()
 
 
 class MyHandler(rpc.RPCHandler):