diff options
| author | Ned Deily <nad@acm.org> | 2011-01-31 00:52:49 (GMT) |
|---|---|---|
| committer | Ned Deily <nad@acm.org> | 2011-01-31 00:52:49 (GMT) |
| commit | 60651535c997bd3b55afb3b5718680ec2a404f69 (patch) | |
| tree | 4f27bc63a372537f1b30360944494dcf7183d08d /Lib/idlelib | |
| parent | 7f41b88bb7b978205a438c7eea2b7f6bba6862d0 (diff) | |
| download | cpython-60651535c997bd3b55afb3b5718680ec2a404f69.zip cpython-60651535c997bd3b55afb3b5718680ec2a404f69.tar.gz cpython-60651535c997bd3b55afb3b5718680ec2a404f69.tar.bz2 | |
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.
........
Diffstat (limited to 'Lib/idlelib')
| -rw-r--r-- | Lib/idlelib/EditorWindow.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py index def7590..a487302 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) |