From: Ned Deily <nad@acm.org>
Date: Sun, 18 Jan 2015 05:03:41 +0000 (-0800)
Subject: Issue #23180: Rename IDLE "Windows" menu item to "Window".
X-Git-Tag: v2.7.10rc1~226
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b5daa3d6db429017dea1e4f15b78557e03b5f847;p=thirdparty%2FPython%2Fcpython.git

Issue #23180: Rename IDLE "Windows" menu item to "Window".
Patch by Al Sweigart.
---

diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst
index e9a91aed5066..bc4a791ed2e0 100644
--- a/Doc/library/idle.rst
+++ b/Doc/library/idle.rst
@@ -258,8 +258,8 @@ Code Context (toggle)(Editor Window only)
    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
index 8ec0f3294dcc..d34fc62aa4b9 100644
--- a/Lib/idlelib/EditorWindow.py
+++ b/Lib/idlelib/EditorWindow.py
@@ -469,13 +469,10 @@ class EditorWindow(object):
         ("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
index 427d3ce72c3a..996c4705bd6e 100755
--- a/Lib/idlelib/PyShell.py
+++ b/Lib/idlelib/PyShell.py
@@ -871,13 +871,10 @@ class PyShell(OutputWindow):
         ("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
index bd6822c4233d..6b1c0023eee6 100644
--- a/Lib/idlelib/help.txt
+++ b/Lib/idlelib/help.txt
@@ -100,7 +100,7 @@ Options Menu:
 			  which is scrolling off the top or the window.
 			  (Not present in Shell window.)
 
-Windows Menu:
+Window Menu:
 
 	Zoom Height -- toggles the window between configured size
 	and maximum height.
diff --git a/Misc/ACKS b/Misc/ACKS
index 20ff71c6ca5c..c50f76e973e4 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1310,6 +1310,7 @@ Hisao Suzuki
 Kalle Svensson
 Andrew Svetlov
 Paul Swartz
+Al Sweigart
 Thenault Sylvain
 Péter Szabó
 John Szakmeister
diff --git a/Misc/NEWS b/Misc/NEWS
index b34d4178ad1a..1f4d4a39476a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -86,6 +86,9 @@ IDLE
 - Issue #16893: Update Idle doc chapter to match current Idle and add new
   information.
 
+- Issue #23180: Rename IDLE "Windows" menu item to "Window".
+  Patch by Al Sweigart.
+
 Build
 -----