summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Doc/library/idle.rst4
-rw-r--r--Lib/idlelib/EditorWindow.py5
-rwxr-xr-xLib/idlelib/PyShell.py5
-rw-r--r--Lib/idlelib/help.txt2
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS3
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 7d2ea8f..1520ad0 100644
--- 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 6b43988..51aa3f4 100755
--- 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 6378a2e..7eff370 100644
--- 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 6c810a9..733683d 100644
--- 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 403bf87..7f87c2d 100644
--- 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
-----