[Python-checkins] cpython (3.3): Issue #16809: Fixed some tkinter incompabilities with Tcl/Tk 8.6.
serhiy.storchaka
python-checkins at python.org
Thu Aug 22 16:56:02 CEST 2013
http://hg.python.org/cpython/rev/516b0cd87a90
changeset: 85326:516b0cd87a90
branch: 3.3
parent: 85323:6b841e1ee3b8
user: Serhiy Storchaka <storchaka at gmail.com>
date: Thu Aug 22 17:51:58 2013 +0300
summary:
Issue #16809: Fixed some tkinter incompabilities with Tcl/Tk 8.6.
files:
Lib/tkinter/__init__.py | 8 ++++----
Lib/tkinter/test/test_ttk/test_widgets.py | 4 ++--
Misc/NEWS | 2 ++
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py
--- a/Lib/tkinter/__init__.py
+++ b/Lib/tkinter/__init__.py
@@ -1352,7 +1352,7 @@
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 @@
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 @@
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 @@
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
diff --git a/Lib/tkinter/test/test_ttk/test_widgets.py b/Lib/tkinter/test/test_ttk/test_widgets.py
--- a/Lib/tkinter/test/test_ttk/test_widgets.py
+++ b/Lib/tkinter/test/test_ttk/test_widgets.py
@@ -105,7 +105,7 @@
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 @@
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(),
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -66,6 +66,8 @@
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.
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list