@@ -21,7 +21,7 @@
# Django imports.
from django import template
from django.core import urlresolvers
from django import urls
from django.utils.html import format_html
@@ -62,7 +62,7 @@ def html_link(text, view, *args, **kwarg
# Generate the URL by using the supplied view name and arguments that should
# be passed to the view.
url = urlresolvers.reverse(view, args=args)
url = urls.reverse(view, args=args)
# Set-up the base pattern (url, parameters, text).
if 'get' in kwargs:
@@ -121,8 +121,8 @@ def current_url_equals(context, url_name
resolved = False
try:
# Use the request path, and resolve it to a URL name.
resolved = urlresolvers.resolve(context.get('request').path)
except urlresolvers.Resolver404:
resolved = urls.resolve(context.get('request').path)
except urls.Resolver404:
# This means we haven't been able to resolve the path from request.
pass