flake8

matthiask · matthiask · commit 6d32fe7c174d · 2015-09-03T21:40:55.000+02:00
diff --git a/feincms/extensions/translations.py b/feincms/extensions/translations.py
@@ -33,6 +33,7 @@
 
 # ------------------------------------------------------------------------
 logger = logging.getLogger(__name__)
+LANGUAGE_COOKIE_NAME = django_settings.LANGUAGE_COOKIE_NAME
 
 
 # ------------------------------------------------------------------------
@@ -43,9 +44,9 @@ def user_has_language_set(request):
     site's language settings, after all, the user's decision is what counts.
     """
     if (hasattr(request, 'session')
-            and request.session.get(django_settings.LANGUAGE_COOKIE_NAME) is not None):
+            and request.session.get(LANGUAGE_COOKIE_NAME) is not None):
         return True
-    if django_settings.LANGUAGE_COOKIE_NAME in request.COOKIES:
+    if LANGUAGE_COOKIE_NAME in request.COOKIES:
         return True
     return False
 
@@ -85,8 +86,8 @@ def translation_set_language(request, select_language):
 
     if hasattr(request, 'session'):
         # User has a session, then set this language there
-        if select_language != request.session.get(django_settings.LANGUAGE_COOKIE_NAME):
-            request.session[django_settings.LANGUAGE_COOKIE_NAME] = select_language
+        if select_language != request.session.get(LANGUAGE_COOKIE_NAME):
+            request.session[LANGUAGE_COOKIE_NAME] = select_language
     elif request.method == 'GET' and not fallback:
         # No session is active. We need to set a cookie for the language
         # so that it persists when users change their location to somewhere
@@ -95,7 +96,7 @@ def translation_set_language(request, select_language):
         # POST requests)
         response = HttpResponseRedirect(request.get_full_path())
         response.set_cookie(
-            str(django_settings.LANGUAGE_COOKIE_NAME), select_language)
+            str(LANGUAGE_COOKIE_NAME), select_language)
         return response
 
 
diff --git a/feincms/templatetags/feincms_admin_tags.py b/feincms/templatetags/feincms_admin_tags.py
@@ -1,7 +1,5 @@
 from __future__ import absolute_import, unicode_literals
 
-import warnings
-
 from django import template
 from django.contrib.auth import get_permission_codename
 
