[Python-checkins] bpo-39050: The Help button in IDLE's config menu works again (GH-17611)

[Miss Islington (bot)]

https://github.com/python/cpython/commit/3b7618809df647574e8aad4c2d869a1d55df147c
commit: 3b7618809df647574e8aad4c2d869a1d55df147c
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2020-01-22T20:13:29-08:00
summary:

bpo-39050: The Help button in IDLE's config menu works again (GH-17611)


Co-authored-by: Terry Jan Reedy <tjreedy at udel.edu>
(cherry picked from commit 2e43b64c94e49f7133b9c26e84c9519935c49063)

Co-authored-by: Zackery Spytz <zspytz at gmail.com>

files:
A Misc/NEWS.d/next/IDLE/2020-01-22-22-28-06.bpo-39050.zkn0FO.rst
M Lib/idlelib/NEWS.txt
M Lib/idlelib/configdialog.py
M Lib/idlelib/idle_test/test_configdialog.py

diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index 6e30ef35081f2..b0bcacdf58604 100644
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -3,6 +3,8 @@ Released on 2019-12-16?
 ======================================
 
 
+bpo-39050: Make Settings dialog Help button work again.
+
 bpo-32989: Add tests for editor newline_and_indent_event method.
 Remove dead code from pyparse find_good_parse_start method.
 
diff --git a/Lib/idlelib/configdialog.py b/Lib/idlelib/configdialog.py
index aaf319bbe1bef..0e007b516ea5e 100644
--- a/Lib/idlelib/configdialog.py
+++ b/Lib/idlelib/configdialog.py
@@ -210,7 +210,7 @@ def help(self):
         """
         page = self.note.tab(self.note.select(), option='text').strip()
         view_text(self, title='Help for IDLE preferences',
-                 text=help_common+help_pages.get(page, ''))
+                  contents=help_common+help_pages.get(page, ''))
 
     def deactivate_current_config(self):
         """Remove current key bindings.
diff --git a/Lib/idlelib/idle_test/test_configdialog.py b/Lib/idlelib/idle_test/test_configdialog.py
index 1f14ed1f26473..7c575d0e5992c 100644
--- a/Lib/idlelib/idle_test/test_configdialog.py
+++ b/Lib/idlelib/idle_test/test_configdialog.py
@@ -47,6 +47,17 @@ def tearDownModule():
     root.destroy()
     root = dialog = None
 
+class ConfigDialogTest(unittest.TestCase):
+
+    def test_help(self):
+        dialog.note.select(dialog.keyspage)
+        saved = configdialog.view_text
+        view = configdialog.view_text = Func()
+        dialog.help()
+        s = view.kwds['contents']
+        self.assertTrue(s.startswith('When you click'))
+        self.assertTrue(s.endswith('a different name.\n'))
+        configdialog.view_text = saved
 
 class FontPageTest(unittest.TestCase):
     """Test that font widgets enable users to make font changes.
diff --git a/Misc/NEWS.d/next/IDLE/2020-01-22-22-28-06.bpo-39050.zkn0FO.rst b/Misc/NEWS.d/next/IDLE/2020-01-22-22-28-06.bpo-39050.zkn0FO.rst
new file mode 100644
index 0000000000000..e71265cdf109b
--- /dev/null
+++ b/Misc/NEWS.d/next/IDLE/2020-01-22-22-28-06.bpo-39050.zkn0FO.rst
@@ -0,0 +1 @@
+Make IDLE Settings dialog Help button work again.