traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Chooser.__init__(): Added `wantspec' keyword to conform exactly to 

tkColorChooser.askcolor() interface (i.e. don't return a color name
even if there is an exact match).
This commit is contained in:
Barry Warsaw 1998-10-22 03:44:52 +00:00
parent ca07ba00ac
commit a20f6af862
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Tools/pynche/pyColorChooser.py
View File

@ -13,13 +13,15 @@ class Chooser:
initialcolor = None,
databasefile = None,
initfile = None,
ignore = None):
ignore = None,
wantspec = None):
self.__master = master
self.__initialcolor = initialcolor
self.__databasefile = databasefile
self.__initfile = initfile or os.path.expanduser('~/.pynche')
self.__ignore = ignore
self.__pw = None
self.__wantspec = wantspec
def show(self):
if not self.__pw:
@ -38,9 +40,13 @@ class Chooser:
# try to return the color name from the database if there is an exact
# match, otherwise use the "#rrggbb" spec. TBD: Forget about color
# aliases for now, maybe later we should return these too.
try:
name = colordb.find_byrgb(rgbtuple)[0]
except ColorDB.BadColor:
name = None
if not self.__wantspec:
try:
name = colordb.find_byrgb(rgbtuple)[0]
except ColorDB.BadColor:
pass
if name is None:
name = ColorDB.triplet_to_rrggbb(rgbtuple)
return rgbtuple, name