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.
........

diff --git a/Lib/tkinter/test/test_ttk/test_widgets.py b/Lib/tkinter/test/test_ttk/test_widgets.py
index 48a522301896eb72fce15b7ece97ee870f9e968d..fc3d1e5fd04dcf4d99a32d557ac28b379acbc228 100644 (file)
--- 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('<Control-Tab>')
         self.assertEqual(self.nb.select(), str(self.child2))
+        self.nb.focus_force()
         self.nb.event_generate('<Shift-Control-Tab>')
         self.assertEqual(self.nb.select(), str(self.child1))
+        self.nb.focus_force()
         self.nb.event_generate('<Shift-Control-Tab>')
         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('<Alt-a>')
         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))