diff --git a/horizon/forms/fields.py b/horizon/forms/fields.py index 1ffb321db6..c1afaa0f02 100644 --- a/horizon/forms/fields.py +++ b/horizon/forms/fields.py @@ -20,7 +20,7 @@ import six from django.core.exceptions import ValidationError # noqa from django.core import urlresolvers from django.forms import fields -from django.forms.util import flatatt # noqa +from django.forms.utils import flatatt # noqa from django.forms import widgets from django.utils.encoding import force_text from django.utils.functional import Promise # noqa diff --git a/horizon/templates/auth/_login.html b/horizon/templates/auth/_login.html index cf8a5a07f7..a47f31d1c9 100644 --- a/horizon/templates/auth/_login.html +++ b/horizon/templates/auth/_login.html @@ -1,6 +1,5 @@ {% extends "horizon/common/_modal_form.html" %} {% load i18n %} -{% load url from future %} {% block modal-header %}{% trans "Log In" %}{% endblock %} {% block modal_class %}login {% if hide %}modal{% endif %}{% endblock %} diff --git a/horizon/templates/horizon/_script_i18n.html b/horizon/templates/horizon/_script_i18n.html index 54eb3c2f62..ea5f90d7bd 100644 --- a/horizon/templates/horizon/_script_i18n.html +++ b/horizon/templates/horizon/_script_i18n.html @@ -1,3 +1,2 @@ -{% load url from future %} {% comment %} Django's JavaScript i18n Implementation {% endcomment %} diff --git a/horizon/templates/horizon/_sidebar.html b/horizon/templates/horizon/_sidebar.html index 99b801769c..3cac6fecc0 100644 --- a/horizon/templates/horizon/_sidebar.html +++ b/horizon/templates/horizon/_sidebar.html @@ -1,5 +1,4 @@ {% load horizon i18n %} -{% load url from future %}