mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-15 14:20:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merged revisions 68010 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r68010 | martin.v.loewis | 2008-12-29 17:22:25 +0100 (Mo, 29 Dez 2008) | 2 lines

  Issue #3767: Convert Tk object to string in tkColorChooser.
........
This commit is contained in:
Martin v. Löwis 2008-12-29 16:23:43 +00:00
parent 659bf292e2
commit 918ae52c48
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Lib/lib-tk/tkColorChooser.py
View file

@ -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()