Issue #17532: Always include Options menu for IDLE on OS X.
Patch by Guilherme Simões.
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 @@
# 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 38cbfcf..7b9b583 100644
--- a/Lib/idlelib/EditorWindow.py
+++ b/Lib/idlelib/EditorWindow.py
@@ -467,7 +467,6 @@
]
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 81af85a..0a77bb5 100644
--- a/Lib/idlelib/PyShell.py
+++ b/Lib/idlelib/PyShell.py
@@ -844,7 +844,6 @@
]
if macosxSupport.runningAsOSXApp():
- del menu_specs[-3]
menu_specs[-2] = ("windows", "_Window")
diff --git a/Misc/ACKS b/Misc/ACKS
index 37ed4ce..21a1a49 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -941,6 +941,7 @@
Ionel Simionescu
Kirill Simonov
Nathan Paul Simons
+Guilherme Simões
Ravi Sinha
Janne Sinkkonen
Ng Pheng Siong
diff --git a/Misc/NEWS b/Misc/NEWS
index 7a72030..9c472dd 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -28,6 +28,9 @@
- Issue #14146: Highlight source line while debugging on Windows.
+- Issue #17532: Always include Options menu for IDLE on OS X.
+ Patch by Guilherme Simões.
+
Tests
-----