[Python-checkins] cpython (3.4): Issue #23180: Rename IDLE "Windows" menu item to "Window".

Sun Jan 18 06:10:34 CET 2015

https://hg.python.org/cpython/rev/8c0e5b507794
changeset: 94200:8c0e5b507794
branch: 3.4
parent: 94197:65ac2b992673
user: Ned Deily <nad at acm.org>
date: Sat Jan 17 21:06:27 2015 -0800
summary:
 Issue #23180: Rename IDLE "Windows" menu item to "Window".
Patch by Al Sweigart.
files:
 Doc/library/idle.rst | 4 ++--
 Lib/idlelib/EditorWindow.py | 5 +----
 Lib/idlelib/PyShell.py | 5 +----
 Lib/idlelib/help.txt | 2 +-
 Misc/ACKS | 1 +
 Misc/NEWS | 3 +++
 6 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst
--- a/Doc/library/idle.rst
+++ b/Doc/library/idle.rst
@@ -258,8 +258,8 @@
 Open a pane at the top of the edit window which shows the block context
 of the code which has scrolled above the top of the window.
 
-Windows menu (Shell and Editor)
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Window menu (Shell and Editor)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Zoom Height
 Toggles the window between normal size and maximum height. The initial size
diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py
--- a/Lib/idlelib/EditorWindow.py
+++ b/Lib/idlelib/EditorWindow.py
@@ -439,13 +439,10 @@
 ("format", "F_ormat"),
 ("run", "_Run"),
 ("options", "_Options"),
- ("windows", "_Windows"),
+ ("windows", "_Window"),
 ("help", "_Help"),
 ]
 
- if sys.platform == "darwin":
- menu_specs[-2] = ("windows", "_Window")
-
 
 def createmenubar(self):
 mbar = self.menubar
diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py
--- a/Lib/idlelib/PyShell.py
+++ b/Lib/idlelib/PyShell.py
@@ -848,13 +848,10 @@
 ("edit", "_Edit"),
 ("debug", "_Debug"),
 ("options", "_Options"),
- ("windows", "_Windows"),
+ ("windows", "_Window"),
 ("help", "_Help"),
 ]
 
- if sys.platform == "darwin":
- menu_specs[-2] = ("windows", "_Window")
-
 
 # New classes
 from idlelib.IdleHistory import History
diff --git a/Lib/idlelib/help.txt b/Lib/idlelib/help.txt
--- a/Lib/idlelib/help.txt
+++ b/Lib/idlelib/help.txt
@@ -138,7 +138,7 @@
 window. This is not present in the Shell
 window only the Editor window.
 
-Windows Menu (Shell and Editor):
+Window Menu (Shell and Editor):
 
 Zoom Height -- Toggles the window between normal size (40x80 initial
 setting) and maximum height. The initial size is in the Configure
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1320,6 +1320,7 @@
 Kalle Svensson
 Andrew Svetlov
 Paul Swartz
+Al Sweigart
 Thenault Sylvain
 Péter Szabó
 John Szakmeister
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -272,6 +272,9 @@
 - Issue #21986: Code objects are not normally pickled by the pickle module.
 To match this, they are no longer pickled when running under Idle.
 
+- Issue #23180: Rename IDLE "Windows" menu item to "Window".
+ Patch by Al Sweigart.
+
 Tests
 -----
 
-- 
Repository URL: https://hg.python.org/cpython
