From 33c7420e7dd9d8e5b2aa15e98da6291bab6fcf33 Mon Sep 17 00:00:00 2001
From: Terry Jan Reedy <tjreedy@udel.edu>
Date: Wed, 20 Jun 2018 22:49:55 -0400
Subject: [PATCH]  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').
---
 Lib/idlelib/autocomplete_w.py                               | 4 ++--
 Lib/idlelib/editor.py                                       | 6 +++---
 Lib/idlelib/idle_test/test_mainmenu.py                      | 2 +-
 Lib/idlelib/macosx.py                                       | 2 +-
 Lib/idlelib/mainmenu.py                                     | 2 +-
 Lib/idlelib/pyshell.py                                      | 2 +-
 .../next/IDLE/2018-06-20-22-14-07.bpo-33924.6Rz1wt.rst      | 2 ++
 7 files changed, 11 insertions(+), 9 deletions(-)
 create mode 100644 Misc/NEWS.d/next/IDLE/2018-06-20-22-14-07.bpo-33924.6Rz1wt.rst

diff --git a/Lib/idlelib/autocomplete_w.py b/Lib/idlelib/autocomplete_w.py
index 66211d4554a..9e0d336523d 100644
--- a/Lib/idlelib/autocomplete_w.py
+++ b/Lib/idlelib/autocomplete_w.py
@@ -246,7 +246,7 @@ class AutoCompleteWindow:
         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 @@ class AutoCompleteWindow:
         # 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 3f034f88100..1a163891c27 100644
--- a/Lib/idlelib/editor.py
+++ b/Lib/idlelib/editor.py
@@ -267,7 +267,7 @@ class EditorWindow(object):
         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 @@ class EditorWindow(object):
         ("format", "F_ormat"),
         ("run", "_Run"),
         ("options", "_Options"),
-        ("windows", "_Window"),
+        ("window", "_Window"),
         ("help", "_Help"),
     ]
 
@@ -437,7 +437,7 @@ class EditorWindow(object):
 
     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 04711284fb2..7ec0368371c 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 3d296123d58..a2260af6e75 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 04acaedb77c..9fe6b522944 100644
--- a/Lib/idlelib/mainmenu.py
+++ b/Lib/idlelib/mainmenu.py
@@ -97,7 +97,7 @@ menudefs = [
    ('_Code Context', '<<toggle-code-context>>'),
    ]),
 
- ('windows', [
+ ('window', [
    ('Zoom Height', '<<zoom-height>>'),
    ]),
 
diff --git a/Lib/idlelib/pyshell.py b/Lib/idlelib/pyshell.py
index 6746489eef4..52c11e30dbd 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 00000000000..03f9efd4380
--- /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.