Fix a few flake8 warnings

matthiask · matthiask · commit 199b4ec55145 · 2015-04-16T09:48:57.000+02:00
diff --git a/feincms/__init__.py b/feincms/__init__.py
@@ -80,14 +80,14 @@ def ensure_completely_loaded(force=False):
             # http://goo.gl/XNI2qz
             model._meta._fill_fields_cache()
 
-        # Calls to get_models(...) are cached by the arguments used in the call.
-        # This cache is normally cleared in loading.register_models(), but we
-        # invalidate the get_models() cache, by calling get_models
-        # above before all apps have loaded. (Django's load_app() doesn't clear the
+        # Calls to get_models(...) are cached by the arguments used in the
+        # call.  This cache is normally cleared in loading.register_models(),
+        # but we invalidate the get_models() cache, by calling get_models above
+        # before all apps have loaded. (Django's load_app() doesn't clear the
         # get_models cache as it perhaps should). So instead we clear the
-        # get_models cache again here. If we don't do this, Django 1.5 chokes on
-        # a model validation error (Django 1.4 doesn't exhibit this problem).
-        # See Issue #323 on github.
+        # get_models cache again here. If we don't do this, Django 1.5 chokes
+        # on a model validation error (Django 1.4 doesn't exhibit this
+        # problem).  See Issue #323 on github.
         if hasattr(apps, 'cache'):
             try:
                 apps.cache.get_models.cache_clear()  # Django 1.7+
diff --git a/feincms/module/page/processors.py b/feincms/module/page/processors.py
@@ -7,8 +7,10 @@
 from django.conf import settings as django_settings
 from django.http import Http404, HttpResponseRedirect
 
+
 logger = logging.getLogger(__name__)
 
+
 def redirect_request_processor(page, request):
     """
     Returns a ``HttpResponseRedirect`` instance if the current page says
@@ -19,7 +21,8 @@ def redirect_request_processor(page, request):
         extra_path = request._feincms_extra_context.get('extra_path', '/')
         if extra_path == '/':
             return HttpResponseRedirect(target)
-        logger.debug("Page redirect on '%s' not taken because extra path '%s' present",
+        logger.debug(
+            "Page redirect on '%s' not taken because extra path '%s' present",
             page.get_absolute_url(), extra_path)
         raise Http404()
 
diff --git a/feincms/views/cbv/views.py b/feincms/views/cbv/views.py
@@ -9,8 +9,10 @@
 from feincms._internal import get_model
 from feincms.module.mixins import ContentView
 
+
 logger = logging.getLogger(__name__)
 
+
 class Handler(ContentView):
     page_model_path = None
     context_object_name = 'feincms_page'
@@ -32,21 +34,27 @@ def dispatch(self, request, *args, **kwargs):
             return super(Handler, self).dispatch(request, *args, **kwargs)
         except Http404 as e:
             if settings.FEINCMS_CMS_404_PAGE is not None:
-                logger.info("Http404 raised for '%s', attempting redirect to FEINCMS_CMS_404_PAGE", args[0])
+                logger.info(
+                    "Http404 raised for '%s', attempting redirect to"
+                    " FEINCMS_CMS_404_PAGE", args[0])
                 try:
-                    # Fudge environment so that we end up resolving the right page.
-                    # Note: request.path is used by the page redirect processor to
-                    # determine if the redirect can be taken, must be == to page url
+                    # Fudge environment so that we end up resolving the right
+                    # page.
+                    # Note: request.path is used by the page redirect processor
+                    # to determine if the redirect can be taken, must be == to
+                    # page url
                     request.path = settings.FEINCMS_CMS_404_PAGE
                     response = super(Handler, self).dispatch(
                         request, settings.FEINCMS_CMS_404_PAGE, **kwargs)
-                    # Only set status if we actually have a page. If we get
-                    # for example a redirect, overwriting would yield a blank page
+                    # Only set status if we actually have a page. If we get for
+                    # example a redirect, overwriting would yield a blank page
                     if response.status_code == 200:
                         response.status_code = 404
                     return response
                 except Http404:
-                    logger.error("Http404 raised while resolving FEINCMS_CMS_404_PAGE=%s",
+                    logger.error(
+                        "Http404 raised while resolving"
+                        " FEINCMS_CMS_404_PAGE=%s",
                         settings.FEINCMS_CMS_404_PAGE)
                     raise e
             else:
