[Python-checkins] r60783 - python/branches/release25-maint/Lib/idlelib/NEWS.txt python/branches/release25-maint/Lib/idlelib/run.py

[kurt.kaiser]

Author: kurt.kaiser
Date: Thu Feb 14 05:45:30 2008
New Revision: 60783

Modified:
   python/branches/release25-maint/Lib/idlelib/NEWS.txt
   python/branches/release25-maint/Lib/idlelib/run.py
Log:
There was an error on exit if no sys.exitfunc was defined. Issue 1647.
Backport r60227


Modified: python/branches/release25-maint/Lib/idlelib/NEWS.txt
==============================================================================
--- python/branches/release25-maint/Lib/idlelib/NEWS.txt	(original)
+++ python/branches/release25-maint/Lib/idlelib/NEWS.txt	Thu Feb 14 05:45:30 2008
@@ -3,6 +3,9 @@
 
 *Release date: XX-FEB-2008*
 
+- There was an error on exit if no sys.exitfunc was defined. Issue 1647.
+  (backport r60227)
+
 - Could not open files in .idlerc directory if latter was hidden on Windows.  
   Issue 1743, Issue 1862. (backport r60225, r60745)
 

Modified: python/branches/release25-maint/Lib/idlelib/run.py
==============================================================================
--- python/branches/release25-maint/Lib/idlelib/run.py	(original)
+++ python/branches/release25-maint/Lib/idlelib/run.py	Thu Feb 14 05:45:30 2008
@@ -205,7 +205,10 @@
 
     """
     if no_exitfunc:
-        del sys.exitfunc
+        try:
+            del sys.exitfunc
+        except AttributeError:
+            pass
     sys.exit(0)
 
 class MyRPCServer(rpc.RPCServer):