[Python-checkins] cpython (merge 3.3 -> default): Issue #17532: merge

[ned.deily]

http://hg.python.org/cpython/rev/d0a093f40801
changeset:   83898:d0a093f40801
parent:      83895:1c6de7a3d700
parent:      83897:75c3e9a659bc
user:        Ned Deily <nad at acm.org>
date:        Wed May 22 15:24:44 2013 -0700
summary:
  Issue #17532: merge

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
@@ -1154,6 +1154,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
@@ -370,6 +370,9 @@
 
 - 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
 -----
 

-- 
Repository URL: http://hg.python.org/cpython