diff options
| author | Sascha Silbe <sascha-pgp@silbe.org> | 2010-10-17 10:04:32 (GMT) |
|---|---|---|
| committer | Sascha Silbe <sascha-pgp@silbe.org> | 2010-11-30 11:50:09 (GMT) |
| commit | a56f9b71a8a38c54b4571a96f9c37db7b9451b9e (patch) | |
| tree | 995e9e3902f85c703dba34df56a3aecde2eb4507 /src/sugar/graphics/xocolor.py | |
| parent | c7bd7f27b044bdfff356c7c4ea180d7d99bedc99 (diff) | |
XoColor: don't choke if passed the wrong type (SL#1408)sucrose-0.90
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>
Diffstat (limited to 'src/sugar/graphics/xocolor.py')
| -rw-r--r-- | src/sugar/graphics/xocolor.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/sugar/graphics/xocolor.py b/src/sugar/graphics/xocolor.py index fd329cb..036d695 100644 --- a/src/sugar/graphics/xocolor.py +++ b/src/sugar/graphics/xocolor.py @@ -209,6 +209,10 @@ colors = [ 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': return ['#ffffff', '#414141'] elif color_string == 'insensitive': |