[Python-checkins] bpo-33924: Change IDLE mainmenu.menudefs key 'windows' to 'window' (GH-7836)
Terry Jan Reedy
webhook-mailer at python.org
Wed Jun 20 22:50:05 EDT 2018
https://github.com/python/cpython/commit/33c7420e7dd9d8e5b2aa15e98da6291bab6fcf33
commit: 33c7420e7dd9d8e5b2aa15e98da6291bab6fcf33
branch: master
author: Terry Jan Reedy <tjreedy at udel.edu>
committer: GitHub <noreply at github.com>
date: 2018-06-20T22:49:55-04:00
summary:
bpo-33924: Change IDLE mainmenu.menudefs key 'windows' to 'window' (GH-7836)
Every other menudef key is the lowercase version of the
corresponding main menu entry (in this case, 'Window').
files:
A Misc/NEWS.d/next/IDLE/2018-06-20-22-14-07.bpo-33924.6Rz1wt.rst
M Lib/idlelib/autocomplete_w.py
M Lib/idlelib/editor.py
M Lib/idlelib/idle_test/test_mainmenu.py
M Lib/idlelib/macosx.py
M Lib/idlelib/mainmenu.py
M Lib/idlelib/pyshell.py
diff --git a/Lib/idlelib/autocomplete_w.py b/Lib/idlelib/autocomplete_w.py
index 66211d4554a2..9e0d336523d4 100644
--- a/Lib/idlelib/autocomplete_w.py
+++ b/Lib/idlelib/autocomplete_w.py
@@ -246,7 +246,7 @@ def winconfig_event(self, event):
acw.wm_geometry("+%d+%d" % (new_x, new_y))
if platform.system().startswith('Windows'):
- # See issue 15786. When on windows platform, Tk will misbehave
+ # See issue 15786. When on Windows platform, Tk will misbehave
# to call winconfig_event multiple times, we need to prevent this,
# otherwise mouse button double click will not be able to used.
acw.unbind(WINCONFIG_SEQUENCE, self.winconfigid)
@@ -269,7 +269,7 @@ def hide_event(self, event):
# mouse click on widget / text area.
if self.is_active():
if event.type == EventType.FocusOut:
- # On windows platform, it will need to delay the check for
+ # On Windows platform, it will need to delay the check for
# acw.focus_get() when click on acw, otherwise it will return
# None and close the window
self.widget.after(1, self._hide_event_check)
diff --git a/Lib/idlelib/editor.py b/Lib/idlelib/editor.py
index 3f034f881007..1a163891c27d 100644
--- a/Lib/idlelib/editor.py
+++ b/Lib/idlelib/editor.py
@@ -267,7 +267,7 @@ def __init__(self, flist=None, filename=None, key=None, root=None):
self.saved_change_hook()
self.update_recent_files_list()
self.load_extensions()
- menu = self.menudict.get('windows')
+ menu = self.menudict.get('window')
if menu:
end = menu.index("end")
if end is None:
@@ -410,7 +410,7 @@ def set_line_and_column(self, event=None):
("format", "F_ormat"),
("run", "_Run"),
("options", "_Options"),
- ("windows", "_Window"),
+ ("window", "_Window"),
("help", "_Help"),
]
@@ -437,7 +437,7 @@ def createmenubar(self):
def postwindowsmenu(self):
# Only called when Window menu exists
- menu = self.menudict['windows']
+ menu = self.menudict['window']
end = menu.index("end")
if end is None:
end = -1
diff --git a/Lib/idlelib/idle_test/test_mainmenu.py b/Lib/idlelib/idle_test/test_mainmenu.py
index 04711284fb2f..7ec0368371c7 100644
--- a/Lib/idlelib/idle_test/test_mainmenu.py
+++ b/Lib/idlelib/idle_test/test_mainmenu.py
@@ -10,7 +10,7 @@ class MainMenuTest(unittest.TestCase):
def test_menudefs(self):
actual = [item[0] for item in mainmenu.menudefs]
expect = ['file', 'edit', 'format', 'run', 'shell',
- 'debug', 'options', 'windows', 'help']
+ 'debug', 'options', 'window', 'help']
self.assertEqual(actual, expect)
def test_default_keydefs(self):
diff --git a/Lib/idlelib/macosx.py b/Lib/idlelib/macosx.py
index 3d296123d58c..a2260af6e753 100644
--- a/Lib/idlelib/macosx.py
+++ b/Lib/idlelib/macosx.py
@@ -148,7 +148,7 @@ def overrideRootMenu(root, flist):
root.configure(menu=menubar)
menudict = {}
- menudict['windows'] = menu = Menu(menubar, name='windows', tearoff=0)
+ menudict['window'] = menu = Menu(menubar, name='window', tearoff=0)
menubar.add_cascade(label='Window', menu=menu, underline=0)
def postwindowsmenu(menu=menu):
diff --git a/Lib/idlelib/mainmenu.py b/Lib/idlelib/mainmenu.py
index 04acaedb77c0..9fe6b5229446 100644
--- a/Lib/idlelib/mainmenu.py
+++ b/Lib/idlelib/mainmenu.py
@@ -97,7 +97,7 @@
('_Code Context', '<<toggle-code-context>>'),
]),
- ('windows', [
+ ('window', [
('Zoom Height', '<<zoom-height>>'),
]),
diff --git a/Lib/idlelib/pyshell.py b/Lib/idlelib/pyshell.py
index 6746489eef41..52c11e30dbd5 100755
--- a/Lib/idlelib/pyshell.py
+++ b/Lib/idlelib/pyshell.py
@@ -852,7 +852,7 @@ class PyShell(OutputWindow):
("edit", "_Edit"),
("debug", "_Debug"),
("options", "_Options"),
- ("windows", "_Window"),
+ ("window", "_Window"),
("help", "_Help"),
]
diff --git a/Misc/NEWS.d/next/IDLE/2018-06-20-22-14-07.bpo-33924.6Rz1wt.rst b/Misc/NEWS.d/next/IDLE/2018-06-20-22-14-07.bpo-33924.6Rz1wt.rst
new file mode 100644
index 000000000000..03f9efd43802
--- /dev/null
+++ b/Misc/NEWS.d/next/IDLE/2018-06-20-22-14-07.bpo-33924.6Rz1wt.rst
@@ -0,0 +1,2 @@
+Change mainmenu.menudefs key 'windows' to 'window'. Every other menudef key
+is lowercase version of main menu entry.
More information about the Python-checkins
mailing list