aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/tools
diff options
context:
space:
mode:
authorBoris Bobrov <breton@cynicmansion.ru>2016-07-31 07:16:48 +0300
committerBoris Bobrov <breton@cynicmansion.ru>2016-07-31 07:16:48 +0300
commit06d70c4b968c4d116496d93228f306aea29e5066 (patch)
treed9b6526e63482761b0316b54d40323e671b6f1ac /mediagoblin/tools
parent474a56ce90c6b2d3112276ff7c20adeb1bd0450f (diff)
downloadmediagoblin-06d70c4b968c4d116496d93228f306aea29e5066.tar.lz
mediagoblin-06d70c4b968c4d116496d93228f306aea29e5066.tar.xz
mediagoblin-06d70c4b968c4d116496d93228f306aea29e5066.zip
Fixing themes
Diffstat (limited to 'mediagoblin/tools')
-rw-r--r--mediagoblin/tools/theme.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/mediagoblin/tools/theme.py b/mediagoblin/tools/theme.py
index 97b041a6..79fd91e1 100644
--- a/mediagoblin/tools/theme.py
+++ b/mediagoblin/tools/theme.py
@@ -68,7 +68,7 @@ def register_themes(app_config, builtin_dir=BUILTIN_THEME_DIR):
themedata = themedata_for_theme_dir(themedir, abs_themedir)
registry[themedir] = themedata
-
+
# Built-in themes
if os.path.exists(builtin_dir):
_install_themes_in_dir(builtin_dir)
@@ -79,11 +79,9 @@ def register_themes(app_config, builtin_dir=BUILTIN_THEME_DIR):
_install_themes_in_dir(theme_install_dir)
current_theme_name = app_config.get('theme')
- if current_theme_name \
- and registry.has_key(current_theme_name):
+ try:
current_theme = registry[current_theme_name]
- else:
+ except KeyError:
current_theme = None
return registry, current_theme
-