flake8 clean everything

matthiask · matthiask · commit 67bb54403fd7 · 2016-04-27T14:10:03.000+02:00
diff --git a/feincms/extensions/translations.py b/feincms/extensions/translations.py
@@ -49,8 +49,8 @@ def user_has_language_set(request):
     This is taken later on as an indication that we should not mess with the
     site's language settings, after all, the user's decision is what counts.
     """
-    if (hasattr(request, 'session')
-            and request.session.get(LANGUAGE_SESSION_KEY) is not None):
+    if (hasattr(request, 'session') and
+            request.session.get(LANGUAGE_SESSION_KEY) is not None):
         return True
     if LANGUAGE_COOKIE_NAME in request.COOKIES:
         return True
diff --git a/feincms/module/medialibrary/modeladmins.py b/feincms/module/medialibrary/modeladmins.py
@@ -123,7 +123,6 @@ class MediaFileAdmin(ExtensionModelAdmin):
     def get_urls(self):
         from django.conf.urls import url
 
-        urls = super(MediaFileAdmin, self).get_urls()
         return [
             url(
                 r'^mediafile-bulk-upload/$',
diff --git a/feincms/module/page/models.py b/feincms/module/page/models.py
@@ -4,9 +4,6 @@
 
 from __future__ import absolute_import, unicode_literals
 
-import re
-
-from django.apps import apps
 from django.core.exceptions import PermissionDenied
 from django.db import models
 from django.db.models import Q
@@ -21,7 +18,10 @@
 from feincms.module.mixins import ContentModelMixin
 from feincms.module.page import processors
 from feincms.utils.managers import ActiveAwareContentManagerMixin
-from feincms.utils import shorten_string, match_model_string, get_model_instance
+from feincms.utils import (
+    shorten_string, match_model_string, get_model_instance
+)
+
 
 # ------------------------------------------------------------------------
 class BasePageManager(ActiveAwareContentManagerMixin, TreeManager):
diff --git a/feincms/utils/__init__.py b/feincms/utils/__init__.py
@@ -15,6 +15,7 @@
 
 from feincms import settings
 
+
 # ------------------------------------------------------------------------
 def get_object(path, fail_silently=False):
     # Return early if path isn't a string (might already be an callable or
@@ -34,6 +35,7 @@ def get_object(path, fail_silently=False):
             if not fail_silently:
                 raise
 
+
 # ------------------------------------------------------------------------
 def get_model_instance(app_label, model_name, pk):
     """
@@ -56,10 +58,12 @@ def get_model_instance(app_label, model_name, pk):
 
     return None
 
+
 # ------------------------------------------------------------------------
 REDIRECT_TO_RE = re.compile(
     r'^(?P<app_label>\w+).(?P<model_name>\w+):(?P<pk>\d+)$')
 
+
 def match_model_string(s):
     """
     Try to parse a string in format "app_label.model_name:pk", as is used
@@ -75,6 +79,7 @@ def match_model_string(s):
     matches = match.groupdict()
     return (matches['app_label'], matches['model_name'], int(matches['pk']))
 
+
 # ------------------------------------------------------------------------
 def copy_model_instance(obj, exclude=None):
     """
