From 06d70c4b968c4d116496d93228f306aea29e5066 Mon Sep 17 00:00:00 2001
From: Boris Bobrov <breton@cynicmansion.ru>
Date: Sun, 31 Jul 2016 07:16:48 +0300
Subject: [PATCH] Fixing themes

---
 mediagoblin/tools/theme.py | 8 +++-----
 1 file 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
-
-- 
2.25.1