From a0820897a8579534b8cf6ea09be2c2431f7107f9 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Sun, 11 Apr 2010 22:04:51 +0000 Subject: [PATCH] Merged revisions 79903,79907 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r79903 | martin.v.loewis | 2010-04-08 04:47:40 -0500 (Thu, 08 Apr 2010) | 2 lines Issue #8344: Fix test_ttk bug on FreeBSD. ........ r79907 | martin.v.loewis | 2010-04-08 12:38:32 -0500 (Thu, 08 Apr 2010) | 2 lines Issue #8204: Fix test_ttk notebook test by forcing focus. ........ --- Lib/tkinter/test/test_ttk/test_widgets.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Lib/tkinter/test/test_ttk/test_widgets.py b/Lib/tkinter/test/test_ttk/test_widgets.py index 48a52230189..fc3d1e5fd04 100644 --- a/Lib/tkinter/test/test_ttk/test_widgets.py +++ b/Lib/tkinter/test/test_ttk/test_widgets.py @@ -704,15 +704,19 @@ class NotebookTest(unittest.TestCase): self.nb.select(0) support.simulate_mouse_click(self.nb, 5, 5) + self.nb.focus_force() self.nb.event_generate('') self.assertEqual(self.nb.select(), str(self.child2)) + self.nb.focus_force() self.nb.event_generate('') self.assertEqual(self.nb.select(), str(self.child1)) + self.nb.focus_force() self.nb.event_generate('') self.assertEqual(self.nb.select(), str(self.child2)) self.nb.tab(self.child1, text='a', underline=0) self.nb.enable_traversal() + self.nb.focus_force() self.nb.event_generate('') self.assertEqual(self.nb.select(), str(self.child1)) @@ -1112,9 +1116,9 @@ class TreeviewTest(unittest.TestCase): self.assertRaises(tkinter.TclError, self.tv.tag_configure, 'test', sky='blue') self.tv.tag_configure('test', foreground='blue') - self.assertEqual(self.tv.tag_configure('test', 'foreground'), + self.assertEqual(str(self.tv.tag_configure('test', 'foreground')), 'blue') - self.assertEqual(self.tv.tag_configure('test', foreground=None), + self.assertEqual(str(self.tv.tag_configure('test', foreground=None)), 'blue') self.assertTrue(isinstance(self.tv.tag_configure('test'), dict))