LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Fixed/added some config parsing tests

Browse Source
This commit is contained in:
Andrew Chin
2012-01-02 01:10:43 -05:00
parent a1dc392526
commit c14cd1a66f
5 changed files with 39 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
overviewer_core/settingsValidators.py
View File

@@ -62,15 +62,22 @@ def validateBGColor(color):
"""BG color must be an HTML color, with an option leading # (hash symbol)
returns an (r,b,g) 3-tuple
"""
if color[0] != "#":
color = "#%s" % color
if len(color) != 7:
raise ValidationException("%r is not a valid color. Expected HTML color syntax (i.e. #RRGGBB)" % color)
r = int(color[1:3], 16)
g = int(color[3:5], 16)
b = int(color[5:7], 16)
return (r,g,b,0)
if type(color) == str:
if color[0] != "#":
color = "#" + color
if len(color) != 7:
raise ValidationException("%r is not a valid color. Expected HTML color syntax (i.e. #RRGGBB)" % color)
try:
r = int(color[1:3], 16)
g = int(color[3:5], 16)
b = int(color[5:7], 16)
return (r,g,b,0)
except ValueError:
raise ValidationException("%r is not a valid color. Expected HTML color syntax (i.e. #RRGGBB)" % color)
elif type(color) == tuple:
if len(color) != 4:
raise ValidationException("%r is not a valid color. Expected a 4-tuple" % (color,))
return color
def validateOptImg(opt):