diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2014-05-23 20:58:13 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2014-05-23 20:58:13 (GMT) |
| commit | 10cbb1e463378391d2368874bb31af0447fa73e6 (patch) | |
| tree | 62e49b1c0a1fa47d2caeafc43825d771d6029752 | |
| parent | 8447c703d1fd0107a52b15de7ce3a7056e1ec160 (diff) | |
| download | cpython-10cbb1e463378391d2368874bb31af0447fa73e6.zip cpython-10cbb1e463378391d2368874bb31af0447fa73e6.tar.gz cpython-10cbb1e463378391d2368874bb31af0447fa73e6.tar.bz2 | |
Fixed new Tkinter tests added in issue #21522 with Tk 8.4.
| -rw-r--r-- | Lib/tkinter/test/test_tkinter/test_widgets.py | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/Lib/tkinter/test/test_tkinter/test_widgets.py b/Lib/tkinter/test/test_tkinter/test_widgets.py index 3cbf5aa..bac2755 100644 --- a/Lib/tkinter/test/test_tkinter/test_widgets.py +++ b/Lib/tkinter/test/test_tkinter/test_widgets.py @@ -961,12 +961,15 @@ class PanedWindowTest(AbstractWidgetTest, unittest.TestCase): self.assertEqual(v, p.paneconfigure(b, k)) self.assertEqual(v[4], p.panecget(b, k)) - def check_paneconfigure(self, p, b, name, value, expected): - if not self.wantobjects: + def check_paneconfigure(self, p, b, name, value, expected, stringify=False): + conv = lambda x: x + if not self.wantobjects or stringify: expected = str(expected) + if self.wantobjects and stringify: + conv = str p.paneconfigure(b, **{name: value}) - self.assertEqual(p.paneconfigure(b, name)[4], expected) - self.assertEqual(p.panecget(b, name), expected) + self.assertEqual(conv(p.paneconfigure(b, name)[4]), expected) + self.assertEqual(conv(p.panecget(b, name)), expected) def check_paneconfigure_bad(self, p, b, name, msg): with self.assertRaisesRegex(TclError, msg): @@ -986,10 +989,12 @@ class PanedWindowTest(AbstractWidgetTest, unittest.TestCase): def test_paneconfigure_height(self): p, b, c = self.create2() - self.check_paneconfigure(p, b, 'height', 10, 10) + self.check_paneconfigure(p, b, 'height', 10, 10, + stringify=tcl_version < (8, 5)) self.check_paneconfigure_bad(p, b, 'height', 'bad screen distance "badValue"') + @requires_tcl(8, 5) def test_paneconfigure_hide(self): p, b, c = self.create2() self.check_paneconfigure(p, b, 'hide', False, 0) @@ -1022,6 +1027,7 @@ class PanedWindowTest(AbstractWidgetTest, unittest.TestCase): 'be a string containing zero or more of ' 'n, e, s, and w') + @requires_tcl(8, 5) def test_paneconfigure_stretch(self): p, b, c = self.create2() self.check_paneconfigure(p, b, 'stretch', 'alw', 'always') @@ -1031,7 +1037,8 @@ class PanedWindowTest(AbstractWidgetTest, unittest.TestCase): def test_paneconfigure_width(self): p, b, c = self.create2() - self.check_paneconfigure(p, b, 'width', 10, 10) + self.check_paneconfigure(p, b, 'width', 10, 10, + stringify=tcl_version < (8, 5)) self.check_paneconfigure_bad(p, b, 'width', 'bad screen distance "badValue"') |