diff options
| author | Ned Deily <nad@acm.org> | 2015-01-18 05:09:16 (GMT) |
|---|---|---|
| committer | Ned Deily <nad@acm.org> | 2015-01-18 05:09:16 (GMT) |
| commit | 140fc9f501bb08c192c180ceb59d238d3a980403 (patch) | |
| tree | 1744e58dd01ce3da6227f092b924b3092f87aeda /Lib/idlelib | |
| parent | a77c8b375a74b5fe4f331897ebb06b5690ed1b25 (diff) | |
| parent | ccb416fee2c680252a16a55f2640cba3bde80185 (diff) | |
| download | cpython-140fc9f501bb08c192c180ceb59d238d3a980403.zip cpython-140fc9f501bb08c192c180ceb59d238d3a980403.tar.gz cpython-140fc9f501bb08c192c180ceb59d238d3a980403.tar.bz2 | |
Issue #23180: merge from 3.4
Diffstat (limited to 'Lib/idlelib')
| -rw-r--r-- | Lib/idlelib/EditorWindow.py | 5 | ||||
| -rwxr-xr-x | Lib/idlelib/PyShell.py | 5 | ||||
| -rw-r--r-- | Lib/idlelib/help.txt | 2 |
3 files changed, 3 insertions, 9 deletions
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 |