mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-04 06:06:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

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

Browse source
This commit is contained in:
Serhiy Storchaka 2013-08-22 17:53:06 +03:00
commit e39e54d0b3
3 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Lib/tkinter/__init__.py
View file

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

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

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

2
Misc/NEWS
View file

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