changeset: 85326:516b0cd87a90 branch: 3.3 parent: 85323:6b841e1ee3b8 user: Serhiy Storchaka date: Thu Aug 22 17:51:58 2013 +0300 files: Lib/tkinter/__init__.py Lib/tkinter/test/test_ttk/test_widgets.py Misc/NEWS description: Issue #16809: Fixed some tkinter incompabilities with Tcl/Tk 8.6. diff -r 6b841e1ee3b8 -r 516b0cd87a90 Lib/tkinter/__init__.py --- a/Lib/tkinter/__init__.py Thu Aug 22 17:40:31 2013 +0300 +++ b/Lib/tkinter/__init__.py Thu Aug 22 17:51:58 2013 +0300 @@ -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 -r 6b841e1ee3b8 -r 516b0cd87a90 Lib/tkinter/test/test_ttk/test_widgets.py --- a/Lib/tkinter/test/test_ttk/test_widgets.py Thu Aug 22 17:40:31 2013 +0300 +++ b/Lib/tkinter/test/test_ttk/test_widgets.py Thu Aug 22 17:51:58 2013 +0300 @@ -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 -r 6b841e1ee3b8 -r 516b0cd87a90 Misc/NEWS --- a/Misc/NEWS Thu Aug 22 17:40:31 2013 +0300 +++ b/Misc/NEWS Thu Aug 22 17:51:58 2013 +0300 @@ -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.