Fix a few new flake8 warnings

matthiask · matthiask · commit 1ebdde815a0f · 2015-03-10T13:39:46.000+01:00
diff --git a/feincms/admin/filterspecs.py b/feincms/admin/filterspecs.py
@@ -2,10 +2,10 @@
 
 import warnings
 
-warnings.warn(
-    'feincms.admin.filterspecs has been renamed to feincms.admin.filters.',
-    DeprecationWarning, stacklevel=2)
-
 from .filters import ParentFieldListFilter, CategoryFieldListFilter
 
 __all__ = ('ParentFieldListFilter', 'CategoryFieldListFilter')
+
+warnings.warn(
+    'feincms.admin.filterspecs has been renamed to feincms.admin.filters.',
+    DeprecationWarning, stacklevel=2)
diff --git a/feincms/module/extensions/translations.py b/feincms/module/extensions/translations.py
@@ -49,6 +49,7 @@ def user_has_language_set(request):
         return True
     return False
 
+
 # ------------------------------------------------------------------------
 def translation_allowed_language(select_language):
     "Check for feincms specific set of allowed front end languages."
@@ -59,6 +60,7 @@ def translation_allowed_language(select_language):
 
     return select_language
 
+
 # ------------------------------------------------------------------------
 def translation_set_language(request, select_language):
     """
@@ -206,9 +208,11 @@ def available_translations(self):
             if not self.id:  # New, unsaved pages have no translations
                 return []
 
-            filter_active = lambda queryset: queryset
             if hasattr(cls.objects, 'apply_active_filters'):
                 filter_active = cls.objects.apply_active_filters
+            else:
+                def filter_active(queryset):
+                    return queryset
 
             if is_primary_language(self.language):
                 return filter_active(self.translations.all())
diff --git a/feincms/module/page/processors.py b/feincms/module/page/processors.py
@@ -156,13 +156,15 @@ def debug_sql_queries_response_processor(verbose=False, file=sys.stderr):
     def processor(page, request, response):
         from django.db import connection
 
-        print_sql = lambda x: x
         try:
             import sqlparse
-            print_sql = lambda x: sqlparse.format(
-                x, reindent=True, keyword_case='upper')
+
+            def print_sql(x):
+                return sqlparse.format(
+                    x, reindent=True, keyword_case='upper')
         except:
-            pass
+            def print_sql(x):
+                return x
 
         if verbose:
             print("-" * 60, file=file)
diff --git a/feincms/module/page/templatetags/feincms_page_tags.py b/feincms/module/page/templatetags/feincms_page_tags.py
@@ -2,18 +2,18 @@
 
 import warnings
 
-warnings.warn(
-    'feincms_page_tags has been moved to'
-    ' feincms.templatetags.feincms_page_tags.',
-    DeprecationWarning, stacklevel=2)
+from feincms.templatetags.feincms_page_tags import (
+    feincms_nav, feincms_translated_or_base, feincms_breadcrumbs,
+    is_equal_or_parent_of, is_sibling_of, siblings_along_path_to,
+    page_is_active)
 
 __all__ = (
     'feincms_nav', 'feincms_translated_or_base', 'feincms_breadcrumbs',
     'is_equal_or_parent_of', 'is_sibling_of', 'siblings_along_path_to',
     'page_is_active',
 )
 
-from feincms.templatetags.feincms_page_tags import (
-    feincms_nav, feincms_translated_or_base, feincms_breadcrumbs,
-    is_equal_or_parent_of, is_sibling_of, siblings_along_path_to,
-    page_is_active)
+warnings.warn(
+    'feincms_page_tags has been moved to'
+    ' feincms.templatetags.feincms_page_tags.',
+    DeprecationWarning, stacklevel=2)
diff --git a/feincms/views/cbv/urls.py b/feincms/views/cbv/urls.py
@@ -2,10 +2,10 @@
 
 import warnings
 
-warnings.warn(
-    'feincms.views.cbv has been deprecated. Use feincms.urls and feincms.views'
-    ' directly instead.', DeprecationWarning, stacklevel=2)
+from feincms.urls import urlpatterns, Handler, handler
 
 __all__ = ('urlpatterns', 'Handler', 'handler')
 
-from feincms.urls import urlpatterns, Handler, handler
+warnings.warn(
+    'feincms.views.cbv has been deprecated. Use feincms.urls and feincms.views'
+    ' directly instead.', DeprecationWarning, stacklevel=2)
