Issue #27939: Fixed bugs in tkinter.ttk.LabeledScale and tkinter.Scale caused

by representing the scale as float value internally in Tk.  tkinter.IntVar
now works if float value is set to underlying Tk variable.
This commit is contained in:
Serhiy Storchaka 2016-10-30 18:53:09 +02:00
commit 686583c05a
4 changed files with 25 additions and 9 deletions

View File

@ -500,7 +500,11 @@ class IntVar(Variable):
def get(self): def get(self):
"""Return the value of the variable as an integer.""" """Return the value of the variable as an integer."""
return self._tk.getint(self._tk.globalgetvar(self._name)) value = self._tk.globalgetvar(self._name)
try:
return self._tk.getint(value)
except (TypeError, TclError):
return int(self._tk.getdouble(value))
class DoubleVar(Variable): class DoubleVar(Variable):
"""Value holder for float variables.""" """Value holder for float variables."""
@ -3003,7 +3007,7 @@ class Scale(Widget):
value = self.tk.call(self._w, 'get') value = self.tk.call(self._w, 'get')
try: try:
return self.tk.getint(value) return self.tk.getint(value)
except (ValueError, TclError): except (ValueError, TypeError, TclError):
return self.tk.getdouble(value) return self.tk.getdouble(value)
def set(self, value): def set(self, value):
"""Set the value to VALUE.""" """Set the value to VALUE."""

View File

@ -217,15 +217,14 @@ class TestIntVar(TestBase):
self.assertEqual(123, v.get()) self.assertEqual(123, v.get())
self.root.globalsetvar("name", "345") self.root.globalsetvar("name", "345")
self.assertEqual(345, v.get()) self.assertEqual(345, v.get())
self.root.globalsetvar("name", "876.5")
self.assertEqual(876, v.get())
def test_invalid_value(self): def test_invalid_value(self):
v = IntVar(self.root, name="name") v = IntVar(self.root, name="name")
self.root.globalsetvar("name", "value") self.root.globalsetvar("name", "value")
with self.assertRaises((ValueError, TclError)): with self.assertRaises((ValueError, TclError)):
v.get() v.get()
self.root.globalsetvar("name", "345.0")
with self.assertRaises((ValueError, TclError)):
v.get()
class TestDoubleVar(TestBase): class TestDoubleVar(TestBase):

View File

@ -69,14 +69,12 @@ class LabeledScaleTest(AbstractTkTest, unittest.TestCase):
# variable initialization/passing # variable initialization/passing
passed_expected = (('0', 0), (0, 0), (10, 10), passed_expected = (('0', 0), (0, 0), (10, 10),
(-1, -1), (sys.maxsize + 1, sys.maxsize + 1)) (-1, -1), (sys.maxsize + 1, sys.maxsize + 1),
(2.5, 2), ('2.5', 2))
for pair in passed_expected: for pair in passed_expected:
x = ttk.LabeledScale(self.root, from_=pair[0]) x = ttk.LabeledScale(self.root, from_=pair[0])
self.assertEqual(x.value, pair[1]) self.assertEqual(x.value, pair[1])
x.destroy() x.destroy()
x = ttk.LabeledScale(self.root, from_='2.5')
self.assertRaises((ValueError, tkinter.TclError), x._variable.get)
x.destroy()
x = ttk.LabeledScale(self.root, from_=None) x = ttk.LabeledScale(self.root, from_=None)
self.assertRaises((ValueError, tkinter.TclError), x._variable.get) self.assertRaises((ValueError, tkinter.TclError), x._variable.get)
x.destroy() x.destroy()
@ -155,8 +153,10 @@ class LabeledScaleTest(AbstractTkTest, unittest.TestCase):
# The following update is needed since the test doesn't use mainloop, # The following update is needed since the test doesn't use mainloop,
# at the same time this shouldn't affect test outcome # at the same time this shouldn't affect test outcome
x.update() x.update()
self.assertEqual(x.value, newval)
self.assertEqual(x.label['text'], self.assertEqual(x.label['text'],
newval if self.wantobjects else str(newval)) newval if self.wantobjects else str(newval))
self.assertEqual(float(x.scale.get()), newval)
self.assertGreater(x.scale.coords()[0], curr_xcoord) self.assertGreater(x.scale.coords()[0], curr_xcoord)
self.assertEqual(x.scale.coords()[0], self.assertEqual(x.scale.coords()[0],
int(x.label.place_info()['x'])) int(x.label.place_info()['x']))
@ -168,10 +168,19 @@ class LabeledScaleTest(AbstractTkTest, unittest.TestCase):
conv = int conv = int
x.value = conv(x.scale['to']) + 1 # no changes shouldn't happen x.value = conv(x.scale['to']) + 1 # no changes shouldn't happen
x.update() x.update()
self.assertEqual(x.value, newval)
self.assertEqual(conv(x.label['text']), newval) self.assertEqual(conv(x.label['text']), newval)
self.assertEqual(float(x.scale.get()), newval)
self.assertEqual(x.scale.coords()[0], self.assertEqual(x.scale.coords()[0],
int(x.label.place_info()['x'])) int(x.label.place_info()['x']))
# non-integer value
x.value = newval = newval + 1.5
x.update()
self.assertEqual(x.value, int(newval))
self.assertEqual(conv(x.label['text']), int(newval))
self.assertEqual(float(x.scale.get()), newval)
x.destroy() x.destroy()

View File

@ -99,6 +99,10 @@ Core and Builtins
Library Library
------- -------
- Issue #27939: Fixed bugs in tkinter.ttk.LabeledScale and tkinter.Scale caused
by representing the scale as float value internally in Tk. tkinter.IntVar
now works if float value is set to underlying Tk variable.
- Issue #28255: calendar.TextCalendar.prweek() no longer prints a space after - Issue #28255: calendar.TextCalendar.prweek() no longer prints a space after
a weeks's calendar. calendar.TextCalendar.pryear() no longer prints redundant a weeks's calendar. calendar.TextCalendar.pryear() no longer prints redundant
newline after a year's calendar. Based on patch by Xiang Zhang. newline after a year's calendar. Based on patch by Xiang Zhang.