[Python-checkins] r87120 - in python/branches/release31-maint: Lib/idlelib/FileList.py Lib/idlelib/macosxSupport.py Misc/NEWS

[ronald.oussoren]

Author: ronald.oussoren
Date: Tue Dec  7 16:31:07 2010
New Revision: 87120

Log:
Merged revisions 87119 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r87119 | ronald.oussoren | 2010-12-07 16:28:10 +0100 (Tue, 07 Dec 2010) | 2 lines
  
  Fix for issue #10107: Without this patch IDLE on OSX doesn't warn about unsaved files when quitting.
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/idlelib/FileList.py
   python/branches/release31-maint/Lib/idlelib/macosxSupport.py
   python/branches/release31-maint/Misc/NEWS

Modified: python/branches/release31-maint/Lib/idlelib/FileList.py
==============================================================================
--- python/branches/release31-maint/Lib/idlelib/FileList.py	(original)
+++ python/branches/release31-maint/Lib/idlelib/FileList.py	Tue Dec  7 16:31:07 2010
@@ -48,7 +48,7 @@
     def new(self, filename=None):
         return self.EditorWindow(self, filename)
 
-    def close_all_callback(self, event):
+    def close_all_callback(self, *args, **kwds):
         for edit in list(self.inversedict):
             reply = edit.close()
             if reply == "cancel":

Modified: python/branches/release31-maint/Lib/idlelib/macosxSupport.py
==============================================================================
--- python/branches/release31-maint/Lib/idlelib/macosxSupport.py	(original)
+++ python/branches/release31-maint/Lib/idlelib/macosxSupport.py	Tue Dec  7 16:31:07 2010
@@ -97,6 +97,11 @@
     if flist:
         root.bind('<<close-all-windows>>', flist.close_all_callback)
 
+        # The binding above doesn't reliably work on all versions of Tk
+        # on MacOSX. Adding command definition below does seem to do the
+        # right thing for now.
+        root.createcommand('exit', flist.close_all_callback)
+
 
     ###check if Tk version >= 8.4.14; if so, use hard-coded showprefs binding
     tkversion = root.tk.eval('info patchlevel')

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Tue Dec  7 16:31:07 2010
@@ -17,6 +17,8 @@
 Library
 -------
 
+- Issue #10107: Warn about unsaved files in IDLE on OSX.
+
 - Issue #7904: Changes to urllib.parse.urlsplit to handle schemes as defined by
   RFC3986. Anything before :// is considered a scheme and is followed by an
   authority (or netloc) and by '/' led path, which is optional.