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 38cbfcfc559269c4519d2be7f84c1a7be99f2e86..7b9b583db9a2a105a563fac549ccaf511b7aee70 100644 (file)
--- a/Lib/idlelib/EditorWindow.py
+++ b/Lib/idlelib/EditorWindow.py
@@ -467,7 +467,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 81af85a84044e4f53ed3df3e69c1a2f3c54a9015..0a77bb585365396b89d0243e0bdf243ee1be69b2 100644 (file)
--- a/Lib/idlelib/PyShell.py
+++ b/Lib/idlelib/PyShell.py
@@ -844,7 +844,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 37ed4ce01e0b0eef579606f1e8da675d521010f9..21a1a49381af34b637462190255e2de08b0ad74a 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -941,6 +941,7 @@ Michael Simcich
 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 7a720309184e6cf7b7390c0e20c6e9a82ba6697c..9c472ddbf9f999c33741b6182c25d2bb9971df69 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -28,6 +28,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
 -----