diff options
author | Ned Deily <nad@acm.org> | 2015-01-17 21:06:27 -0800 |
---|---|---|
committer | Ned Deily <nad@acm.org> | 2015-01-17 21:06:27 -0800 |
commit | ccb416fee2c680252a16a55f2640cba3bde80185 (patch) | |
tree | d61414d3fd5b7776432b6a610183f10b5a58f011 | |
parent | 3bbb37e09b30baf9ed5926cc765fee1175fb1828 (diff) | |
download | cpython-git-ccb416fee2c680252a16a55f2640cba3bde80185.tar.gz |
Issue #23180: Rename IDLE "Windows" menu item to "Window".
Patch by Al Sweigart.
-rw-r--r-- | Doc/library/idle.rst | 4 | ||||
-rw-r--r-- | Lib/idlelib/EditorWindow.py | 5 | ||||
-rwxr-xr-x | Lib/idlelib/PyShell.py | 5 | ||||
-rw-r--r-- | Lib/idlelib/help.txt | 2 | ||||
-rw-r--r-- | Misc/ACKS | 1 | ||||
-rw-r--r-- | Misc/NEWS | 3 |
6 files changed, 9 insertions, 11 deletions
diff --git a/Doc/library/idle.rst b/Doc/library/idle.rst index e9a91aed50..bc4a791ed2 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 7d2ea8f759..1520ad0231 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 6b439885b2..51aa3f46b8 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 6378a2e722..7eff370040 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 @@ -1320,6 +1320,7 @@ Hisao Suzuki Kalle Svensson Andrew Svetlov Paul Swartz +Al Sweigart Thenault Sylvain Péter Szabó John Szakmeister @@ -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 ----- |