Commit a20f6af8 authored by Barry Warsaw's avatar Barry Warsaw

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).
parent ca07ba00
...@@ -13,13 +13,15 @@ class Chooser: ...@@ -13,13 +13,15 @@ class Chooser:
initialcolor = None, initialcolor = None,
databasefile = None, databasefile = None,
initfile = None, initfile = None,
ignore = None): ignore = None,
wantspec = None):
self.__master = master self.__master = master
self.__initialcolor = initialcolor self.__initialcolor = initialcolor
self.__databasefile = databasefile self.__databasefile = databasefile
self.__initfile = initfile or os.path.expanduser('~/.pynche') self.__initfile = initfile or os.path.expanduser('~/.pynche')
self.__ignore = ignore self.__ignore = ignore
self.__pw = None self.__pw = None
self.__wantspec = wantspec
def show(self): def show(self):
if not self.__pw: if not self.__pw:
...@@ -38,9 +40,13 @@ class Chooser: ...@@ -38,9 +40,13 @@ class Chooser:
# try to return the color name from the database if there is an exact # try to return the color name from the database if there is an exact
# match, otherwise use the "#rrggbb" spec. TBD: Forget about color # match, otherwise use the "#rrggbb" spec. TBD: Forget about color
# aliases for now, maybe later we should return these too. # aliases for now, maybe later we should return these too.
try: name = None
name = colordb.find_byrgb(rgbtuple)[0] if not self.__wantspec:
except ColorDB.BadColor: try:
name = colordb.find_byrgb(rgbtuple)[0]
except ColorDB.BadColor:
pass
if name is None:
name = ColorDB.triplet_to_rrggbb(rgbtuple) name = ColorDB.triplet_to_rrggbb(rgbtuple)
return rgbtuple, name return rgbtuple, name
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment