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 ec2720b0d025a53a5161806ec2cc9395819d1037..fe6e812d2bffa3ccb415d0304dd7100e7ad2f10b 100644 (file)
--- 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 fdcf1a051bee31d60deb3588165041ed26fea460..3318e859e758efaed9ceb4906d672d078ca37371 100644 (file)
--- 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 1805644b6ecf4c39e5c443f23198f81407e863bc..34882a6bf44e77514d1fd5c08726f85e7c409e82 100644 (file)
--- 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")
 
 

diff --git a/Misc/ACKS b/Misc/ACKS
index 4eb8ef6f6a725b71cd956be7496266485fdf01f2..e3cb7009f7e78d567dc122e2b66a3e896adbbf26 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1130,6 +1130,7 @@ Michael Simcich
 Ionel Simionescu
 Kirill Simonov
 Nathan Paul Simons
+Guilherme Simões
 Adam Simpkins
 Ravi Sinha
 Janne Sinkkonen

diff --git a/Misc/NEWS b/Misc/NEWS
index 15c6c9eca5ccb1541f8112e744af81d0f3a7991b..a4e7101e017f028e4b759f30594ea39e08452b90 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -45,6 +45,9 @@ IDLE
 
 - 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
 -----