[Python-checkins] r88270 - in python/branches/release27-maint: Lib/idlelib/EditorWindow.py Misc/NEWS

[ned.deily]

Author: ned.deily
Date: Mon Jan 31 01:52:49 2011
New Revision: 88270

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

........
  r88232 | ned.deily | 2011-01-29 10:29:01 -0800 (Sat, 29 Jan 2011) | 5 lines
  
  Issue #10940: Workaround an IDLE hang on Mac OS X 10.6 when using the
  menu accelerators for Open Module, Go to Line, and New Indent Width.
  The accelerators still work but no longer appear in the menu items.
........


Modified:
   python/branches/release27-maint/   (props changed)
   python/branches/release27-maint/Lib/idlelib/EditorWindow.py
   python/branches/release27-maint/Misc/NEWS

Modified: python/branches/release27-maint/Lib/idlelib/EditorWindow.py
==============================================================================
--- python/branches/release27-maint/Lib/idlelib/EditorWindow.py	(original)
+++ python/branches/release27-maint/Lib/idlelib/EditorWindow.py	Mon Jan 31 01:52:49 2011
@@ -1541,7 +1541,12 @@
 
 def get_accelerator(keydefs, eventname):
     keylist = keydefs.get(eventname)
-    if not keylist:
+    # issue10940: temporary workaround to prevent hang with OS X Cocoa Tk 8.5
+    # if not keylist:
+    if (not keylist) or (macosxSupport.runningAsOSXApp() and eventname in {
+                            "<<open-module>>",
+                            "<<goto-line>>",
+                            "<<change-indentwidth>>"}):
         return ""
     s = keylist[0]
     s = re.sub(r"-[a-z]\b", lambda m: m.group().upper(), s)

Modified: python/branches/release27-maint/Misc/NEWS
==============================================================================
--- python/branches/release27-maint/Misc/NEWS	(original)
+++ python/branches/release27-maint/Misc/NEWS	Mon Jan 31 01:52:49 2011
@@ -37,6 +37,10 @@
 Library
 -------
 
+- Issue #10940: Workaround an IDLE hang on Mac OS X 10.6 when using the
+  menu accelerators for Open Module, Go to Line, and New Indent Width.
+  The accelerators still work but no longer appear in the menu items.
+
 - Issue #10907: Warn OS X 10.6 IDLE users to use ActiveState Tcl/Tk 8.5, rather
   than the currently problematic Apple-supplied one, when running with the
   64-/32-bit installer variant.