summaryrefslogtreecommitdiff
path: root/Lib
diff options
context:
space:
mode:
authorNed Deily <nad@acm.org>2013-05-22 15:19:40 -0700
committerNed Deily <nad@acm.org>2013-05-22 15:19:40 -0700
commit7f0882c920a9a3e3c7244f84743170dcf2324843 (patch)
treef2c1965c59175d9f85c38d2a2f1fc96c9a7aff2f /Lib
parent67246127553cc69b97d13753de1d8d0c9bfffd66 (diff)
downloadcpython-git-7f0882c920a9a3e3c7244f84743170dcf2324843.tar.gz
Issue #17532: Always include Options menu for IDLE on OS X.
Patch by Guilherme Simões.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/idlelib/Bindings.py4
-rw-r--r--Lib/idlelib/EditorWindow.py1
-rw-r--r--Lib/idlelib/PyShell.py1
3 files changed, 4 insertions, 2 deletions
diff --git a/Lib/idlelib/Bindings.py b/Lib/idlelib/Bindings.py
index ec2720b0d0..fe6e812d2b 100644
--- a/Lib/idlelib/Bindings.py
+++ b/Lib/idlelib/Bindings.py
@@ -98,6 +98,10 @@ if macosxSupport.runningAsOSXApp():
# menu
del menudefs[-1][1][0:2]
+ # Remove the 'Configure' entry from the options menu, it is in the
+ # application menu as 'Preferences'
+ del menudefs[-2][1][0:2]
+
default_keydefs = idleConf.GetCurrentKeySet()
del sys
diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py
index fdcf1a051b..3318e859e7 100644
--- a/Lib/idlelib/EditorWindow.py
+++ b/Lib/idlelib/EditorWindow.py
@@ -463,7 +463,6 @@ class EditorWindow(object):
]
if macosxSupport.runningAsOSXApp():
- del menu_specs[-3]
menu_specs[-2] = ("windows", "_Window")
diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py
index 1805644b6e..34882a6bf4 100644
--- a/Lib/idlelib/PyShell.py
+++ b/Lib/idlelib/PyShell.py
@@ -822,7 +822,6 @@ class PyShell(OutputWindow):
]
if macosxSupport.runningAsOSXApp():
- del menu_specs[-3]
menu_specs[-2] = ("windows", "_Window")