changeset:   83898:d0a093f40801
parent:      83895:1c6de7a3d700
parent:      83897:75c3e9a659bc
user:        Ned Deily <nad@acm.org>
date:        Wed May 22 15:24:44 2013 -0700
files:       Lib/idlelib/EditorWindow.py Lib/idlelib/PyShell.py Misc/ACKS Misc/NEWS
description:
Issue #17532: merge


diff -r 1c6de7a3d700 -r d0a093f40801 Lib/idlelib/Bindings.py
--- a/Lib/idlelib/Bindings.py	Wed May 22 13:27:32 2013 -0700
+++ b/Lib/idlelib/Bindings.py	Wed May 22 15:24:44 2013 -0700
@@ -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 -r 1c6de7a3d700 -r d0a093f40801 Lib/idlelib/EditorWindow.py
--- a/Lib/idlelib/EditorWindow.py	Wed May 22 13:27:32 2013 -0700
+++ b/Lib/idlelib/EditorWindow.py	Wed May 22 15:24:44 2013 -0700
@@ -463,7 +463,6 @@
     ]
 
     if macosxSupport.runningAsOSXApp():
-        del menu_specs[-3]
         menu_specs[-2] = ("windows", "_Window")
 
 
diff -r 1c6de7a3d700 -r d0a093f40801 Lib/idlelib/PyShell.py
--- a/Lib/idlelib/PyShell.py	Wed May 22 13:27:32 2013 -0700
+++ b/Lib/idlelib/PyShell.py	Wed May 22 15:24:44 2013 -0700
@@ -822,7 +822,6 @@
     ]
 
     if macosxSupport.runningAsOSXApp():
-        del menu_specs[-3]
         menu_specs[-2] = ("windows", "_Window")
 
 
diff -r 1c6de7a3d700 -r d0a093f40801 Misc/ACKS
--- a/Misc/ACKS	Wed May 22 13:27:32 2013 -0700
+++ b/Misc/ACKS	Wed May 22 15:24:44 2013 -0700
@@ -1154,6 +1154,7 @@
 Ionel Simionescu
 Kirill Simonov
 Nathan Paul Simons
+Guilherme Simões
 Adam Simpkins
 Ravi Sinha
 Janne Sinkkonen
diff -r 1c6de7a3d700 -r d0a093f40801 Misc/NEWS
--- a/Misc/NEWS	Wed May 22 13:27:32 2013 -0700
+++ b/Misc/NEWS	Wed May 22 15:24:44 2013 -0700
@@ -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
 -----