diff options
| author | Ned Deily <nad@acm.org> | 2011-01-31 00:52:49 +0000 |
|---|---|---|
| committer | Ned Deily <nad@acm.org> | 2011-01-31 00:52:49 +0000 |
| commit | 60651535c997bd3b55afb3b5718680ec2a404f69 (patch) | |
| tree | 4f27bc63a372537f1b30360944494dcf7183d08d | |
| parent | 7f41b88bb7b978205a438c7eea2b7f6bba6862d0 (diff) | |
| download | cpython-git-60651535c997bd3b55afb3b5718680ec2a404f69.tar.gz | |
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.
........
| -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 def75904bd..a487302b09 100644 --- a/Lib/idlelib/EditorWindow.py +++ b/Lib/idlelib/EditorWindow.py @@ -1541,7 +1541,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) @@ -37,6 +37,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 #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. |