diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2015-05-06 14:00:04 +0300 |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2015-05-06 14:00:04 +0300 |
| commit | 645058d11a0ce6616d93cce692bb1378e61efb80 (patch) | |
| tree | 16ce60bf4c02ce722c8873bcf8975d0aea1e2030 /Lib/tkinter/test/test_ttk/test_extensions.py | |
| parent | 008d88b46218ea618455c89cba74132be223c1a4 (diff) | |
| download | cpython-git-645058d11a0ce6616d93cce692bb1378e61efb80.tar.gz | |
Issue #23880: Tkinter's getint() and getdouble() now support Tcl_Obj.
Tkinter's getdouble() now supports any numbers (in particular int).
Diffstat (limited to 'Lib/tkinter/test/test_ttk/test_extensions.py')
| -rw-r--r-- | Lib/tkinter/test/test_ttk/test_extensions.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Lib/tkinter/test/test_ttk/test_extensions.py b/Lib/tkinter/test/test_ttk/test_extensions.py index c3af06cddd..f33945cef9 100644 --- a/Lib/tkinter/test/test_ttk/test_extensions.py +++ b/Lib/tkinter/test/test_ttk/test_extensions.py @@ -70,17 +70,15 @@ class LabeledScaleTest(AbstractTkTest, unittest.TestCase): # variable initialization/passing passed_expected = (('0', 0), (0, 0), (10, 10), (-1, -1), (sys.maxsize + 1, sys.maxsize + 1)) - if self.wantobjects: - passed_expected += ((2.5, 2),) for pair in passed_expected: x = ttk.LabeledScale(self.root, from_=pair[0]) self.assertEqual(x.value, pair[1]) x.destroy() x = ttk.LabeledScale(self.root, from_='2.5') - self.assertRaises(ValueError, x._variable.get) + self.assertRaises((ValueError, tkinter.TclError), x._variable.get) x.destroy() x = ttk.LabeledScale(self.root, from_=None) - self.assertRaises(ValueError, x._variable.get) + self.assertRaises((ValueError, tkinter.TclError), x._variable.get) x.destroy() # variable should have its default value set to the from_ value myvar = tkinter.DoubleVar(self.root, value=20) |