From f665c52bf23cb23f31267c8d89a7b837515e7044 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Sun, 19 Aug 2012 02:35:40 -0400 Subject: [PATCH] Update method to return icon set icon and sprite name from dictionary map --- apps/icons/api.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/apps/icons/api.py b/apps/icons/api.py index 2ae275bd0c..83b154cba0 100644 --- a/apps/icons/api.py +++ b/apps/icons/api.py @@ -1,16 +1,22 @@ from __future__ import absolute_import from .conf import settings -from .sets import THEME_ICONSETS, DEFAULT_THEME +from .sets import ICON_THEMES from .literals import ERROR def get_icon_name(icon): try: - return THEME_ICONSETS[settings.ICON_SET][icon] + return ICON_THEMES[settings.ICON_SET][icon] except KeyError: - return THEME_ICONSETS[settings.ICON_SET][ERROR] + return ICON_THEMES[settings.ICON_SET][ERROR] + except AttributeError: + pass - -def get_sprite_name(icon): - return THEME_ICONSETS[DEFAULT_THEME]['sprites'][icon] +def get_sprite_name(sprite): + try: + return ICON_THEMES[settings.ICON_SET][sprite] + except KeyError: + return ICON_THEMES[settings.ICON_SET][ERROR] + except AttributeError: + pass