PEP8 cleanups

apps/navigation/api.py

@@ -5,17 +5,16 @@ import urllib
 import logging
 import re
 
-from django.template import (TemplateSyntaxError, Library,
-    VariableDoesNotExist, Node, Variable)
-from django.utils.encoding import smart_str, force_unicode, smart_unicode
+from django.template import (VariableDoesNotExist, Variable)
+from django.utils.encoding import smart_str, smart_unicode
 from django.core.urlresolvers import reverse, NoReverseMatch
 from django.utils.http import urlquote
 from django.utils.http import urlencode
 
-from elementtree.ElementTree import Element, SubElement
+from elementtree.ElementTree import SubElement
 
 from .utils import (resolve_to_name, resolve_arguments,
-    resolve_template_variable, get_navigation_objects)
+    get_navigation_objects)
 from . import main_menu
 
 multi_object_navigation = {}
@@ -111,7 +110,7 @@ class Link(object):
                     resolved_link.url = self.url % kwargs
                 else:
                     resolved_link.url = self.url % args
-                    if link.keep_query:
+                    if self.keep_query:
                         resolved_link.url = u'%s?%s' % (urlquote(resolved_link.url), urlencode(parsed_query_string, doseq=True))
             else:
                 resolved_link.active = False
@@ -198,8 +197,9 @@ def register_multi_item_links(sources, links, menu_name=None):
         multi_object_navigation[menu_name].setdefault(source, {'links': []})
         multi_object_navigation[menu_name][source]['links'].extend(links)
 
+
 #TODO: new name: get_context_navigation_links, get_navigation_links_for_context
-def get_context_object_navigation_links(context, menu_name=None, links_dict=link_binding):#, object_variable_name=None):
+def get_context_object_navigation_links(context, menu_name=None, links_dict=link_binding):
     request = Variable('request').resolve(context)
     current_path = request.META['PATH_INFO']
     current_view = resolve_to_name(current_path)

apps/navigation/templatetags/navigation_tags.py

@@ -2,23 +2,17 @@ from __future__ import absolute_import
 
 import copy
 import re
-import urlparse
-import urllib
 import logging
 
-from django.core.urlresolvers import reverse, NoReverseMatch
+from django.core.urlresolvers import reverse
 from django.template import (TemplateSyntaxError, Library,
-    VariableDoesNotExist, Node, Variable)
+    Node, Variable)
 from django.utils.translation import ugettext as _
-from django.utils.encoding import smart_str, force_unicode, smart_unicode
-
-from common.utils import urlquote
 
 from ..api import (link_binding, multi_object_navigation,
     sidebar_templates, get_context_object_navigation_links)
 from ..forms import MultiItemForm
-from ..utils import (resolve_to_name, resolve_arguments, resolve_template_variable,
-    get_navigation_objects)
+from ..utils import resolve_to_name, resolve_template_variable
 from .. import main_menu
 
 register = Library()
@@ -74,6 +68,7 @@ def object_navigation_template(context):
 
     return new_context
 
+
 @register.tag
 def get_multi_item_links(parser, token):
     tag_name, arg = token.contents.split(None, 1)

apps/navigation/utils.py

@@ -4,8 +4,7 @@ import logging
 
 from django.core.urlresolvers import RegexURLResolver, RegexURLPattern, Resolver404, get_resolver
 
-from django.template import (TemplateSyntaxError, Library,
-    VariableDoesNotExist, Node, Variable)
+from django.template import (VariableDoesNotExist, Variable)
 from django.utils.text import unescape_string_literal
 
 logger = logging.getLogger(__name__)
@@ -152,5 +151,6 @@ def _resolver_resolve_to_name(self, path):
 RegexURLPattern.resolve_to_name = _pattern_resolve_to_name
 RegexURLResolver.resolve_to_name = _resolver_resolve_to_name
 
+
 def resolve_to_name(path, urlconf=None):
     return get_resolver(urlconf).resolve_to_name(path)

apps/navigation/widgets.py

@@ -1,19 +1,14 @@
 from __future__ import absolute_import
 
-import urlparse
-
 from django.utils.safestring import mark_safe
 from django.conf import settings
 from django.utils.translation import ugettext_lazy as _
-from django.core.urlresolvers import reverse
 from django.template.defaultfilters import capfirst
 from django.core.exceptions import PermissionDenied
-from django.template import RequestContext, Variable
+from django.template import RequestContext
 
 from permissions.models import Permission
 
-from .utils import resolve_to_name
-
 
 def button_navigation_widget(request, link):
     if link.permissions: