From: Serhiy Storchaka <storchaka@gmail.com>
Date: Thu, 22 Aug 2013 14:53:16 +0000 (+0300)
Subject: Issue #16809: Fixed some tkinter incompabilities with Tcl/Tk 8.6.
X-Git-Tag: v2.7.6rc1~206
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b445558d8444199deea0e0745db6512930777bd8;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Lib/lib-tk/Tkinter.py b/Lib/lib-tk/Tkinter.py
index 6947bcc41bcc..529a3e4b161f 100644
--- a/Lib/lib-tk/Tkinter.py
+++ b/Lib/lib-tk/Tkinter.py
@@ -1347,7 +1347,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)
@@ -1880,7 +1880,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
@@ -1931,7 +1931,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
@@ -1980,7 +1980,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
diff --git a/Lib/lib-tk/test/test_ttk/test_widgets.py b/Lib/lib-tk/test/test_ttk/test_widgets.py
index 2fcb3fa78160..c594602dd353 100644
--- a/Lib/lib-tk/test/test_ttk/test_widgets.py
+++ b/Lib/lib-tk/test/test_ttk/test_widgets.py
@@ -104,7 +104,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']))
@@ -452,7 +452,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(),
diff --git a/Misc/NEWS b/Misc/NEWS
index 573961030efa..e93858a3339f 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -32,6 +32,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.