Issue #17532: merge

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

Lib/idlelib/EditorWindow.py

@@ -463,7 +463,6 @@ class EditorWindow(object):
     ]
 
     if macosxSupport.runningAsOSXApp():
-        del menu_specs[-3]
         menu_specs[-2] = ("windows", "_Window")
 
 

Lib/idlelib/PyShell.py

@@ -822,7 +822,6 @@ class PyShell(OutputWindow):
     ]
 
     if macosxSupport.runningAsOSXApp():
-        del menu_specs[-3]
         menu_specs[-2] = ("windows", "_Window")
 
 

Misc/ACKS

@@ -1154,6 +1154,7 @@ Michael Simcich
 Ionel Simionescu
 Kirill Simonov
 Nathan Paul Simons
+Guilherme Simões
 Adam Simpkins
 Ravi Sinha
 Janne Sinkkonen

Misc/NEWS

@@ -370,6 +370,9 @@ IDLE
 
 - Issue #14735: Update IDLE docs to omit "Control-z on Windows".
 
+- Issue #17532: Always include Options menu for IDLE on OS X.
+  Patch by Guilherme Simões.
+
 Build
 -----