[Python-checkins] cpython (3.3): Issue #17532: Always include Options menu for IDLE on OS X.

Thu May 23 00:25:19 CEST 2013

http://hg.python.org/cpython/rev/75c3e9a659bc
changeset: 83897:75c3e9a659bc
branch: 3.3
parent: 83894:f911a89d2f1d
user: Ned Deily <nad at acm.org>
date: Wed May 22 15:19:40 2013 -0700
summary:
 Issue #17532: Always include Options menu for IDLE on OS X.
Patch by Guilherme Simões.
files:
 Lib/idlelib/Bindings.py | 4 ++++
 Lib/idlelib/EditorWindow.py | 1 -
 Lib/idlelib/PyShell.py | 1 -
 Misc/ACKS | 1 +
 Misc/NEWS | 3 +++
 5 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Lib/idlelib/Bindings.py b/Lib/idlelib/Bindings.py
--- 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
--- a/Lib/idlelib/EditorWindow.py
+++ b/Lib/idlelib/EditorWindow.py
@@ -463,7 +463,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
--- a/Lib/idlelib/PyShell.py
+++ b/Lib/idlelib/PyShell.py
@@ -822,7 +822,6 @@
 ]
 
 if macosxSupport.runningAsOSXApp():
- del menu_specs[-3]
 menu_specs[-2] = ("windows", "_Window")
 
 
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1130,6 +1130,7 @@
 Ionel Simionescu
 Kirill Simonov
 Nathan Paul Simons
+Guilherme Simões
 Adam Simpkins
 Ravi Sinha
 Janne Sinkkonen
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -45,6 +45,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
 -----
 
-- 
Repository URL: http://hg.python.org/cpython
