summaryrefslogtreecommitdiffstats
path: root/Lib/idlelib
diff options
context:
space:
mode:
authorNed Deily <nad@acm.org>2013-05-22 22:24:44 (GMT)
committerNed Deily <nad@acm.org>2013-05-22 22:24:44 (GMT)
commit6a00b6f4fddef79e22d9969ea7e4d4b573f62429 (patch)
treef7ee525e99675af7cce9c85135602d769daf0012 /Lib/idlelib
parent965efe9e5efdeb53e10f181eb3d872e8f402a9fe (diff)
parent7f0882c920a9a3e3c7244f84743170dcf2324843 (diff)
downloadcpython-6a00b6f4fddef79e22d9969ea7e4d4b573f62429.zip
cpython-6a00b6f4fddef79e22d9969ea7e4d4b573f62429.tar.gz
cpython-6a00b6f4fddef79e22d9969ea7e4d4b573f62429.tar.bz2
Issue #17532: merge
Diffstat (limited to 'Lib/idlelib')
-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 ec2720b..fe6e812 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 7255a44..6bb5301 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 9b3fdf4..4e19226 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")