From: Ned Deily <nad@acm.org>
Date: Sat, 29 Jan 2011 18:29:01 +0000 (+0000)
Subject: Issue #10940: Workaround an IDLE hang on Mac OS X 10.6 when using the
X-Git-Tag: v3.2rc2~19
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=70063937ec871a8c4884a359a94be1bbb737daf4;p=thirdparty%2FPython%2Fcpython.git

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.
---

diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py
index 938a656244ff..6a1e325880c8 100644
--- a/Lib/idlelib/EditorWindow.py
+++ b/Lib/idlelib/EditorWindow.py
@@ -1546,7 +1546,12 @@ keynames = {
 
 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)
diff --git a/Misc/NEWS b/Misc/NEWS
index 51f5ac151b79..68445aba7b64 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -16,6 +16,10 @@ Core and Builtins
 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