diff options
-rw-r--r-- | Lib/idlelib/EditorWindow.py | 7 | ||||
-rw-r--r-- | Misc/NEWS | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py index 938a656..6a1e325 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) @@ -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 |