diff options
| author | Benjamin Peterson <benjamin@python.org> | 2010-04-11 22:04:51 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2010-04-11 22:04:51 (GMT) |
| commit | a0820897a8579534b8cf6ea09be2c2431f7107f9 (patch) | |
| tree | aad5b00888343a31fbbc93f11636bb59c36b4135 /Lib/tkinter | |
| parent | 87cb7876883130fe043ee24611c8e02fc48852d3 (diff) | |
| download | cpython-a0820897a8579534b8cf6ea09be2c2431f7107f9.zip cpython-a0820897a8579534b8cf6ea09be2c2431f7107f9.tar.gz cpython-a0820897a8579534b8cf6ea09be2c2431f7107f9.tar.bz2 | |
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.
........
Diffstat (limited to 'Lib/tkinter')
| -rw-r--r-- | Lib/tkinter/test/test_ttk/test_widgets.py | 8 |
1 files 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 48a5223..fc3d1e5 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('<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)) |