Fix a few stylistic problems

matthiask · matthiask · commit eafe948cd043 · 2017-10-24T18:08:44.000+02:00
Refs #659
diff --git a/feincms/admin/tree_editor.py b/feincms/admin/tree_editor.py
@@ -317,7 +317,7 @@ def _toggle_boolean(self, request):
         try:
             item_id = int(request.POST.get('item_id', None))
             attr = str(request.POST.get('attr', None))
-        except:
+        except Exception:
             return HttpResponseBadRequest("Malformed request")
 
         if not request.user.is_staff:
diff --git a/feincms/extensions/translations.py b/feincms/extensions/translations.py
@@ -62,8 +62,8 @@ def user_has_language_set(request):
 def translation_allowed_language(select_language):
     "Check for feincms specific set of allowed front end languages."
     if settings.FEINCMS_FRONTEND_LANGUAGES:
-        l = select_language[:2]
-        if l not in settings.FEINCMS_FRONTEND_LANGUAGES:
+        language = select_language[:2]
+        if language not in settings.FEINCMS_FRONTEND_LANGUAGES:
             select_language = django_settings.LANGUAGES[0][0]
 
     return select_language
diff --git a/feincms/module/medialibrary/zip.py b/feincms/module/medialibrary/zip.py
@@ -49,7 +49,7 @@ def import_zipfile(category_id, overwrite, data):
         info = json.loads(z.comment)
         if info['export_magic'] == export_magic:
             is_export_file = True
-    except:
+    except Exception:
         pass
 
     # If meta information, do we need to create any categories?
diff --git a/feincms/module/page/processors.py b/feincms/module/page/processors.py
@@ -129,7 +129,7 @@ def processor(page, request, response):
             def print_sql(x):
                 return sqlparse.format(
                     x, reindent=True, keyword_case='upper')
-        except:
+        except Exception:
             def print_sql(x):
                 return x
 
diff --git a/tests/testapp/tests/test_cms.py b/tests/testapp/tests/test_cms.py
@@ -17,7 +17,7 @@
 
 try:
     from unittest import skipIf
-except:
+except ImportError:
     from django.utils.unittest import skipIf
 
 skipUnlessLegacy = skipIf(
