There was an error on exit if no sys.exitfunc was defined. Issue 1647.

diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index d931e98d3ee2bbfe5871fe0d92c88fe769fb3b1a..18d2315666babe056bde9dae1a99b548709b7e68 100644 (file)
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -3,6 +3,8 @@ What's New in IDLE 2.6a1?
 
 *Release date: XX-XXX-2008*
 
+- There was an error on exit if no sys.exitfunc was defined. Issue 1647.
+
 - Could not open files in .idlerc directory if latter was hidden on Windows.
   Issue 1743, Issue 1862.
 

diff --git a/Lib/idlelib/run.py b/Lib/idlelib/run.py
index 4eb64d6bd7d9027ed932fe3a97141e68deb3e6b6..6e919827b9c84aaab8cae34452222e8ab9486ee3 100644 (file)
--- a/Lib/idlelib/run.py
+++ b/Lib/idlelib/run.py
@@ -206,7 +206,10 @@ def exit():
 
     """
     if no_exitfunc:
-        del sys.exitfunc
+        try:
+            del sys.exitfunc
+        except AttributeError:
+            pass
     sys.exit(0)
 
 class MyRPCServer(rpc.RPCServer):