From f30ba3dd662127e4896c1342894fd83cfbfedb51 Mon Sep 17 00:00:00 2001
From: "Kurt B. Kaiser" <kbk@shore.net>
Date: Wed, 23 Jan 2008 22:55:26 +0000
Subject: [PATCH] There was an error on exit if no sys.exitfunc was defined.
 Issue 1647.

---
 Lib/idlelib/NEWS.txt | 2 ++
 Lib/idlelib/run.py   | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index d931e98d3ee2..18d2315666ba 100644
--- 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 4eb64d6bd7d9..6e919827b9c8 100644
--- 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):