[Python-checkins] r88232 - in python/branches/py3k: Lib/idlelib/EditorWindow.py Misc/NEWS

Sat Jan 29 19:29:01 CET 2011

Author: ned.deily
Date: Sat Jan 29 19:29:01 2011
New Revision: 88232
Log:
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/py3k/Lib/idlelib/EditorWindow.py
 python/branches/py3k/Misc/NEWS
Modified: python/branches/py3k/Lib/idlelib/EditorWindow.py
==============================================================================

--- python/branches/py3k/Lib/idlelib/EditorWindow.py	(original)
+++ python/branches/py3k/Lib/idlelib/EditorWindow.py	Sat Jan 29 19:29:01 2011
@@ -1546,7 +1546,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/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS	(original)
+++ python/branches/py3k/Misc/NEWS	Sat Jan 29 19:29:01 2011
@@ -16,6 +16,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 #10989: Fix a crash on SSLContext.load_verify_locations(None, True).
 
 - Issue #11020: Command-line pyclbr was broken because of missing 2-to-3
