sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

XoColor: don't choke if passed the wrong type (SL#1408)

Browse Source 
Color data is stored in the Journal as a JSON dump, so we can get back
arbitrary types. XoColor already checks the color string for validity and
handles invalid strings gracefully, so it makes sense to enhance this to
invalid types as well.

Acked-by: Simon Schampijer <simon@schampijer.de>
This commit is contained in:
Sascha Silbe 2010-10-17 10:04:32 +00:00
parent 18e39672ce
commit 3b0e761f4a
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/sugar/graphics/xocolor.py
View File

@ -209,6 +209,10 @@ colors = [
def _parse_string(color_string): def _parse_string(color_string):
if not isinstance(color_string, (str, unicode)):
logging.error('Invalid color string: %r', color_string)
return None
if color_string == 'white': if color_string == 'white':
return ['#ffffff', '#414141'] return ['#ffffff', '#414141']
elif color_string == 'insensitive': elif color_string == 'insensitive':