bpo-30781: IDLE - use ttk widgets in configdialog (#2654)

Patch by Cheryl Sabella.

1 files changed, 31 insertions, 30 deletions

diff --git a/Lib/idlelib/idle_test/test_configdialog.py b/Lib/idlelib/idle_test/test_configdialog.py
index df801c32b7..c947da1866 100644
--- a/Lib/idlelib/idle_test/test_configdialog.py
+++ b/Lib/idlelib/idle_test/test_configdialog.py
@@ -272,7 +272,7 @@ class HighPageTest(unittest.TestCase):
         # builtinlist sets variable builtin_name to the CurrentTheme default.
         eq(d.builtin_name.get(), 'IDLE Classic')
         eq(d.custom_name.get(), '- no custom themes -')
-        eq(d.custom_theme_on['state'], DISABLED)
+        eq(d.custom_theme_on.state(), ('disabled',))
         eq(d.set_theme_type.called, 1)
         eq(d.paint_theme_sample.called, 1)
         eq(d.set_highlight_target.called, 1)
@@ -315,7 +315,7 @@ class HighPageTest(unittest.TestCase):
         changes.clear()
 
         # Custom selected.
-        d.custom_theme_on['state'] = NORMAL
+        d.custom_theme_on.state(('!disabled',))
         d.custom_theme_on.invoke()
         self.assertEqual(mainpage, {'Theme': {'default': 'False'}})
         eq(d.var_changed_builtin_name.called, 1)
@@ -428,15 +428,15 @@ class HighPageTest(unittest.TestCase):
         d.set_theme_type()
         eq(d.builtinlist['state'], NORMAL)
         eq(d.customlist['state'], DISABLED)
-        eq(d.button_delete_custom['state'], DISABLED)
+        eq(d.button_delete_custom.state(), ('disabled',))
 
         # Custom theme selected.
         d.theme_source.set(False)
         d.set_theme_type()
         eq(d.builtinlist['state'], DISABLED)
-        eq(d.custom_theme_on['state'], NORMAL)
+        eq(d.custom_theme_on.state(), ('selected',))
         eq(d.customlist['state'], NORMAL)
-        eq(d.button_delete_custom['state'], NORMAL)
+        eq(d.button_delete_custom.state(), ())
         d.set_theme_type = Func()
 
     def test_get_color(self):
@@ -455,7 +455,7 @@ class HighPageTest(unittest.TestCase):
         eq(d.color.get(), '#ffffff')
 
         # Selection same as previous color.
-        chooser.result = ('', d.frame_color_set.cget('bg'))
+        chooser.result = ('', d.style.lookup(d.frame_color_set['style'], 'background'))
         d.button_set_color.invoke()
         eq(d.color.get(), '#ffffff')
 
@@ -494,7 +494,7 @@ class HighPageTest(unittest.TestCase):
         d.fg_bg_toggle.set(True)
 
         d.color.set(color)
-        self.assertEqual(d.frame_color_set.cget('bg'), color)
+        self.assertEqual(d.style.lookup(d.frame_color_set['style'], 'background'), color)
         self.assertEqual(d.highlight_sample.tag_cget('hilite', 'foreground'), color)
         self.assertEqual(highpage,
                          {'Python': {'hilite-foreground': color}})
@@ -567,15 +567,15 @@ class HighPageTest(unittest.TestCase):
 
         # Target is cursor.
         d.highlight_target.set('Cursor')
-        eq(d.fg_on['state'], DISABLED)
-        eq(d.bg_on['state'], DISABLED)
+        eq(d.fg_on.state(), ('disabled', 'selected'))
+        eq(d.bg_on.state(), ('disabled',))
         self.assertTrue(d.fg_bg_toggle)
         eq(d.set_color_sample.called, 1)
 
         # Target is not cursor.
         d.highlight_target.set('Comment')
-        eq(d.fg_on['state'], NORMAL)
-        eq(d.bg_on['state'], NORMAL)
+        eq(d.fg_on.state(), ('selected',))
+        eq(d.bg_on.state(), ())
         self.assertTrue(d.fg_bg_toggle)
         eq(d.set_color_sample.called, 2)
 
@@ -597,8 +597,9 @@ class HighPageTest(unittest.TestCase):
         d.highlight_target.set('Selected Text')
         d.fg_bg_toggle.set(True)
         d.set_color_sample()
-        self.assertEqual(d.frame_color_set.cget('bg'),
-                         d.highlight_sample.tag_cget('hilite', 'foreground'))
+        self.assertEqual(
+                d.style.lookup(d.frame_color_set['style'], 'background'),
+                d.highlight_sample.tag_cget('hilite', 'foreground'))
         d.set_color_sample = Func()
 
     def test_paint_theme_sample(self):
@@ -641,7 +642,7 @@ class HighPageTest(unittest.TestCase):
     def test_delete_custom(self):
         eq = self.assertEqual
         d = self.page
-        d.button_delete_custom['state'] = NORMAL
+        d.button_delete_custom.state(('!disabled',))
         yesno = configdialog.tkMessageBox.askyesno = Func()
         dialog.deactivate_current_config = Func()
         dialog.activate_config_changes = Func()
@@ -670,7 +671,7 @@ class HighPageTest(unittest.TestCase):
         eq(yesno.called, 2)
         self.assertNotIn(theme_name, highpage)
         eq(idleConf.GetSectionList('user', 'highlight'), [])
-        eq(d.custom_theme_on['state'], DISABLED)
+        eq(d.custom_theme_on.state(), ('disabled',))
         eq(d.custom_name.get(), '- no custom themes -')
         eq(dialog.deactivate_current_config.called, 1)
         eq(dialog.activate_config_changes.called, 1)
@@ -721,7 +722,7 @@ class KeysPageTest(unittest.TestCase):
         # builtinlist sets variable builtin_name to the CurrentKeys default.
         eq(d.builtin_name.get(), 'IDLE Classic OSX')
         eq(d.custom_name.get(), '- no custom keys -')
-        eq(d.custom_keyset_on['state'], DISABLED)
+        eq(d.custom_keyset_on.state(), ('disabled',))
         eq(d.set_keys_type.called, 1)
         eq(d.load_keys_list.called, 1)
         eq(d.load_keys_list.args, ('IDLE Classic OSX', ))
@@ -765,7 +766,7 @@ class KeysPageTest(unittest.TestCase):
         changes.clear()
 
         # Custom selected.
-        d.custom_keyset_on['state'] = NORMAL
+        d.custom_keyset_on.state(('!disabled',))
         d.custom_keyset_on.invoke()
         self.assertEqual(mainpage, {'Keys': {'default': 'False'}})
         eq(d.var_changed_builtin_name.called, 1)
@@ -847,15 +848,15 @@ class KeysPageTest(unittest.TestCase):
         d.set_keys_type()
         eq(d.builtinlist['state'], NORMAL)
         eq(d.customlist['state'], DISABLED)
-        eq(d.button_delete_custom_keys['state'], DISABLED)
+        eq(d.button_delete_custom_keys.state(), ('disabled',))
 
         # Custom keyset selected.
         d.keyset_source.set(False)
         d.set_keys_type()
         eq(d.builtinlist['state'], DISABLED)
-        eq(d.custom_keyset_on['state'], NORMAL)
+        eq(d.custom_keyset_on.state(), ('selected',))
         eq(d.customlist['state'], NORMAL)
-        eq(d.button_delete_custom_keys['state'], NORMAL)
+        eq(d.button_delete_custom_keys.state(), ())
         d.set_keys_type = Func()
 
     def test_get_new_keys(self):
@@ -865,7 +866,7 @@ class KeysPageTest(unittest.TestCase):
         gkd = configdialog.GetKeysDialog = Func(return_self=True)
         gnkn = d.get_new_keys_name = Func()
 
-        d.button_new_keys['state'] = NORMAL
+        d.button_new_keys.state(('!disabled',))
         d.bindingslist.delete(0, 'end')
         d.bindingslist.insert(0, 'copy - <Control-Shift-Key-C>')
         d.bindingslist.selection_set(0)
@@ -953,7 +954,7 @@ class KeysPageTest(unittest.TestCase):
         b.event_generate('<Button-1>', x=x, y=y)
         b.event_generate('<ButtonRelease-1>', x=x, y=y)
         self.assertEqual(b.get('anchor'), 'find')
-        self.assertEqual(d.button_new_keys['state'], NORMAL)
+        self.assertEqual(d.button_new_keys.state(), ())
 
     def test_create_new_key_set_and_save_new_key_set(self):
         eq = self.assertEqual
@@ -1032,7 +1033,7 @@ class KeysPageTest(unittest.TestCase):
     def test_delete_custom_keys(self):
         eq = self.assertEqual
         d = self.page
-        d.button_delete_custom_keys['state'] = NORMAL
+        d.button_delete_custom_keys.state(('!disabled',))
         yesno = configdialog.tkMessageBox.askyesno = Func()
         dialog.deactivate_current_config = Func()
         dialog.activate_config_changes = Func()
@@ -1061,7 +1062,7 @@ class KeysPageTest(unittest.TestCase):
         eq(yesno.called, 2)
         self.assertNotIn(keyset_name, keyspage)
         eq(idleConf.GetSectionList('user', 'keys'), [])
-        eq(d.custom_keyset_on['state'], DISABLED)
+        eq(d.custom_keyset_on.state(), ('disabled',))
         eq(d.custom_name.get(), '- no custom keys -')
         eq(dialog.deactivate_current_config.called, 1)
         eq(dialog.activate_config_changes.called, 1)
@@ -1173,18 +1174,18 @@ class GenPageTest(unittest.TestCase):
 
         h.delete(0, 'end')
         sad()
-        eq(d.button_helplist_edit['state'], DISABLED)
-        eq(d.button_helplist_remove['state'], DISABLED)
+        eq(d.button_helplist_edit.state(), ('disabled',))
+        eq(d.button_helplist_remove.state(), ('disabled',))
 
         h.insert(0, 'source')
         sad()
-        eq(d.button_helplist_edit['state'], DISABLED)
-        eq(d.button_helplist_remove['state'], DISABLED)
+        eq(d.button_helplist_edit.state(), ('disabled',))
+        eq(d.button_helplist_remove.state(), ('disabled',))
 
         h.selection_set(0)
         sad()
-        eq(d.button_helplist_edit['state'], NORMAL)
-        eq(d.button_helplist_remove['state'], NORMAL)
+        eq(d.button_helplist_edit.state(), ())
+        eq(d.button_helplist_remove.state(), ())
         d.set_add_delete_state = Func()  # Mask method.
 
     def test_helplist_item_add(self):