Browse Source

Issue #16809: Fixed some tkinter incompabilities with Tcl/Tk 8.6.

pull/224/head
Serhiy Storchaka 13 years ago
parent
commit
e39e54d0b3
  1. 8
      Lib/tkinter/__init__.py
  2. 4
      Lib/tkinter/test/test_ttk/test_widgets.py
  3. 2
      Misc/NEWS

8
Lib/tkinter/__init__.py

@ -1352,7 +1352,7 @@ class Misc:
value = words[i+1]
if not value:
value = None
elif '.' in value:
elif '.' in str(value):
value = getdouble(value)
else:
value = getint(value)
@ -1921,7 +1921,7 @@ class Pack:
for i in range(0, len(words), 2):
key = words[i][1:]
value = words[i+1]
if value[:1] == '.':
if str(value)[:1] == '.':
value = self._nametowidget(value)
dict[key] = value
return dict
@ -1972,7 +1972,7 @@ class Place:
for i in range(0, len(words), 2):
key = words[i][1:]
value = words[i+1]
if value[:1] == '.':
if str(value)[:1] == '.':
value = self._nametowidget(value)
dict[key] = value
return dict
@ -2021,7 +2021,7 @@ class Grid:
for i in range(0, len(words), 2):
key = words[i][1:]
value = words[i+1]
if value[:1] == '.':
if str(value)[:1] == '.':
value = self._nametowidget(value)
dict[key] = value
return dict

4
Lib/tkinter/test/test_ttk/test_widgets.py

@ -105,7 +105,7 @@ class CheckbuttonTest(unittest.TestCase):
cbtn['command'] = ''
res = cbtn.invoke()
self.assertEqual(res, '')
self.assertEqual(str(res), '')
self.assertFalse(len(success) > 1)
self.assertEqual(cbtn['offvalue'],
cbtn.tk.globalgetvar(cbtn['variable']))
@ -453,7 +453,7 @@ class RadiobuttonTest(unittest.TestCase):
cbtn2['command'] = ''
res = cbtn2.invoke()
self.assertEqual(res, '')
self.assertEqual(str(res), '')
self.assertFalse(len(success) > 1)
self.assertEqual(cbtn2['value'], myvar.get())
self.assertEqual(myvar.get(),

2
Misc/NEWS

@ -38,6 +38,8 @@ Core and Builtins
Library
-------
- Issue #16809: Fixed some tkinter incompabilities with Tcl/Tk 8.6.
- Issue #16809: Tkinter's splitlist() and split() methods now accept Tcl_Obj
argument.

Loading…
Cancel
Save