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 e9a91aed506686c99801deacefa7d8def6f2873f..bc4a791ed2e0756b53a4156f5350df9beadad05f 100644 (file)
--- 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 7d2ea8f7596979b579f7c31b215b39351982acfc..1520ad02311439cfd38fde271521c8525a72f4f0 100644 (file)
--- a/Lib/idlelib/EditorWindow.py
+++ b/Lib/idlelib/EditorWindow.py
@@ -439,13 +439,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 6b439885b27cce463b675764226ce7be0bd17345..51aa3f46b883c85ff0534bc64fe738befb9a6f0b 100755 (executable)
--- a/Lib/idlelib/PyShell.py
+++ b/Lib/idlelib/PyShell.py
@@ -848,13 +848,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 6378a2e7226b89347994f90eb115fc45a3f7da4a..7eff37004054e89af6cb106d6b7f7ad70008b08d 100644 (file)
--- a/Lib/idlelib/help.txt
+++ b/Lib/idlelib/help.txt
@@ -138,7 +138,7 @@ Options Menu (Shell and Editor):
                                  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
index 6c810a96f52dde5930b80d1e08fa0caf431439ff..733683d21df43b22babbea179a29e93fc601618e 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1320,6 +1320,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 403bf878172d496a5f914dc2018d451977fc44eb..7f87c2d119c7b34016987c114825bbd452f1362e 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -272,6 +272,9 @@ IDLE
 - 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
 -----