From: Ned Deily <nad@acm.org>
Date: Wed, 22 May 2013 22:19:40 +0000 (-0700)
Subject: Issue #17532: Always include Options menu for IDLE on OS X.
X-Git-Tag: v3.4.0a1~652^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7f0882c920a9a3e3c7244f84743170dcf2324843;p=thirdparty%2FPython%2Fcpython.git

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 ec2720b0d025..fe6e812d2bff 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 fdcf1a051bee..3318e859e758 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 1805644b6ecf..34882a6bf44e 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")
 
 
diff --git a/Misc/ACKS b/Misc/ACKS
index 4eb8ef6f6a72..e3cb7009f7e7 100644
--- 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 15c6c9eca5cc..a4e7101e017f 100644
--- 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
 -----