Fixing themes

diff --git a/mediagoblin/tools/theme.py b/mediagoblin/tools/theme.py
index 97b041a61a5cb2cb769dcbc9c21b51e591ddb7d6..79fd91e1b2e956d6a903d6d080fb93bb41d9ea74 100644 (file)
--- 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
-