From b5daa3d6db429017dea1e4f15b78557e03b5f847 Mon Sep 17 00:00:00 2001
From: Ned Deily <nad@acm.org>
Date: Sat, 17 Jan 2015 21:03:41 -0800
Subject: Issue #23180: Rename IDLE "Windows" menu item to "Window". Patch by
Al Sweigart.
---
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
index e9a91ae..bc4a791 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 8ec0f32..d34fc62 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 427d3ce..996c470 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 bd6822c..6b1c002 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 20ff71c..c50f76e 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 b34d417..1f4d4a3 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
-----
--
cgit v0.12