diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2015-10-10 10:15:21 +0000 |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2015-10-10 10:15:21 +0000 |
| commit | b4c49a7b40ae96dbdc079b40b6c317bd2cbdeb55 (patch) | |
| tree | 450aeb71ba9d9118732554bb4a7a4a22edc3734d /Lib/tkinter/test/test_ttk | |
| parent | e013b9445b6f9caab1eb30b7785e3690d1bab4df (diff) | |
| parent | b98a5f90775e5f59662e452b3b31e0c07efa3d2c (diff) | |
| download | cpython-b4c49a7b40ae96dbdc079b40b6c317bd2cbdeb55.tar.gz | |
Issue #22413: Merge StringIO doc from 3.4 into 3.5
Diffstat (limited to 'Lib/tkinter/test/test_ttk')
| -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) |