From: Kurt B. Kaiser <kbk@shore.net>
Date: Sat, 17 May 2003 21:04:10 +0000 (+0000)
Subject: Show Freddy the mirror
X-Git-Tag: v2.3c1~683
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a2792bec1ddfc3f5e38f202de8bc5ca9db4bb869;p=python

Show Freddy the mirror
i.e. improve subprocess exit paths and exeception reporting
---

diff --git a/Lib/idlelib/run.py b/Lib/idlelib/run.py
index ad23793c3d..98255c79ce 100644
--- a/Lib/idlelib/run.py
+++ b/Lib/idlelib/run.py
@@ -53,7 +53,7 @@ def main():
     while 1:
         try:
             if exit_requested:
-                os._exit(0)
+                sys.exit(0)
             try:
                 seq, request = rpc.request_queue.get(0)
             except Queue.Empty:
@@ -64,9 +64,15 @@ def main():
             rpc.response_queue.put((seq, ret))
         except KeyboardInterrupt:
             continue
+        except SystemExit:
+            raise
         except:
-            print_exception()
-            rpc.response_queue.put((seq, None))
+            try:
+                print_exception()
+                rpc.response_queue.put((seq, None))
+            except:
+                traceback.print_exc(file=sys.__stderr__)
+                sys.exit(1.1)
             continue
 
 def manage_socket(address):
@@ -207,13 +213,15 @@ class Executive:
         try:
             exec code in self.locals
         except:
+            if exit_requested:
+                sys.exit(0)
             try:
-                if exit_requested:
-                    os._exit(0)
+                # even print a user code SystemExit exception, continue
                 print_exception()
             except:
-                sys.stderr = sys.__stderr__
-                raise
+                # link not working? 
+                traceback.print_exc(file=sys.__stderr__)
+                sys.exit(1.2)
         else:
             flush_stdout()