From: Martin v. Löwis <martin@v.loewis.de>
Date: Sat, 13 Dec 2008 15:09:44 +0000 (+0000)
Subject: Issue #3767: Convert Tk object to string in tkColorChooser.
X-Git-Tag: v2.5.3c1~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c252d9bc08ccd28578acbe7ab06843801af29c61;p=python

Issue #3767: Convert Tk object to string in tkColorChooser.
---

diff --git a/Lib/lib-tk/tkColorChooser.py b/Lib/lib-tk/tkColorChooser.py
index a55a797dd4..cf6283b357 100644
--- a/Lib/lib-tk/tkColorChooser.py
+++ b/Lib/lib-tk/tkColorChooser.py
@@ -34,19 +34,22 @@ class Chooser(Dialog):
         try:
             # make sure initialcolor is a tk color string
             color = self.options["initialcolor"]
-            if type(color) == type(()):
+            if isinstance(color, tuple):
                 # assume an RGB triplet
                 self.options["initialcolor"] = "#%02x%02x%02x" % color
         except KeyError:
             pass
 
     def _fixresult(self, widget, result):
+        # result can be somethings: an empty tuple, an empty string or
+        # a Tcl_Obj, so this somewhat weird check handles that
+        if not result or not str(result):
+            return None, None # canceled
+
         # to simplify application code, the color chooser returns
         # an RGB tuple together with the Tk color string
-        if not result:
-            return None, None # canceled
         r, g, b = widget.winfo_rgb(result)
-        return (r/256, g/256, b/256), result
+        return (r/256, g/256, b/256), str(result)
 
 
 #
@@ -66,5 +69,4 @@ def askcolor(color = None, **options):
 # test stuff
 
 if __name__ == "__main__":
-
     print "color", askcolor()
diff --git a/Misc/NEWS b/Misc/NEWS
index 99e385a0eb..161668e734 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -109,6 +109,8 @@ Core and builtins
 Library
 -------
 
+- Issue #3767: Convert Tk object to string in tkColorChooser.
+
 - Issue #4342: Always convert Text.index result to string.
 
 - Issue 3248: Allow placing ScrolledText in a PanedWindow.