From f2b2289b4abb0c6e83d229304bf12370d5166109 Mon Sep 17 00:00:00 2001
From: Rob Cresswell <robert.cresswell@outlook.com>
Date: Mon, 14 Sep 2015 14:24:47 +0100
Subject: [PATCH] Drop Django 1.7 support

Django 1.7 support ends in December 2015
(https://www.djangoproject.com/download/#supported-versions), so it
will not be supported by Mitaka release.

This patch removes many of the deprecation warnings:-

`RedirectView.permanent` change:
https://docs.djangoproject.com/en/1.8/ref/class-based-views/base/

`url` change:
https://docs.djangoproject.com/en/1.8/internals/deprecation/
See version 1.5 notes for the url and ssi template tag change

`django.forms.utils` change:
https://docs.djangoproject.com/en/1.8/internals/deprecation/
See version 1.9 notes

`firstof` change:
https://docs.djangoproject.com/en/1.8/internals/deprecation/
See version 1.8 notes for cycle and firstof template tags

Change-Id: If546c087e73d189daa92e5bd63f0533fcf19089f
Partially-Implements: blueprint drop-dj17
---
 horizon/forms/fields.py                                    | 2 +-
 horizon/templates/auth/_login.html                         | 1 -
 horizon/templates/horizon/_script_i18n.html                | 1 -
 horizon/templates/horizon/_sidebar.html                    | 1 -
 horizon/templates/horizon/common/_breadcrumb.html          | 1 -
 horizon/templates/horizon/common/_data_table.html          | 1 -
 horizon/templates/horizon/common/_region_selector.html     | 1 -
 horizon/templates/horizon/common/_sidebar.html             | 1 -
 horizon/templates/horizon/jasmine/jasmine.html             | 1 -
 horizon/utils/html.py                                      | 2 +-
 .../data_processing.cluster_templates/_details.html        | 1 -
 .../_nodegroups_details.html                               | 1 -
 .../data_processing.cluster_templates/_upload_file.html    | 3 +--
 .../data_processing.clusters/_create_cluster.html          | 1 -
 .../templates/data_processing.clusters/_details.html       | 1 -
 .../data_processing.clusters/_nodegroups_details.html      | 1 -
 .../data_processing.data_image_registry/_edit_tags.html    | 3 +--
 .../_register_image.html                                   | 3 +--
 .../templates/data_processing.job_binaries/_create.html    | 1 -
 .../templates/data_processing.job_executions/_details.html | 2 +-
 .../jobs/templates/data_processing.jobs/_details.html      | 1 -
 .../data_processing.nodegroup_templates/_details.html      | 1 -
 .../templates/data_processing.wizard/_job_type_select.html | 3 +--
 .../templates/data_processing.wizard/_plugin_select.html   | 3 +--
 .../templates/data_processing.wizard/cluster_guide.html    | 1 -
 .../templates/data_processing.wizard/jobex_guide.html      | 1 -
 .../wizard/templates/data_processing.wizard/wizard.html    | 1 -
 .../contrib/sahara/content/data_processing/wizard/views.py | 2 ++
 .../databases/templates/databases/_detail_overview.html    | 1 -
 .../databases/templates/databases/_resize_instance.html    | 1 -
 .../databases/templates/databases/_resize_volume.html      | 1 -
 .../admin/aggregates/templates/aggregates/_update.html     | 1 -
 .../templates/hypervisors/compute/_disable_service.html    | 1 -
 .../templates/hypervisors/compute/_evacuate_host.html      | 1 -
 .../templates/hypervisors/compute/_migrate_host.html       | 1 -
 .../admin/instances/templates/instances/_live_migrate.html | 1 -
 .../metadata_defs/templates/metadata_defs/_create.html     | 1 -
 .../templates/metadata_defs/_resource_types.html           | 1 -
 .../admin/metering/templates/metering/_daily.html          | 1 -
 .../admin/metering/templates/metering/stats.html           | 1 -
 .../admin/networks/templates/networks/_create.html         | 1 -
 .../templates/networks/ports/_detail_overview.html         | 1 -
 .../templates/volumes/snapshots/_detail_overview.html      | 1 -
 .../volumes/volume_types/_update_volume_type.html          | 1 -
 .../templates/volumes/volume_types/extras/_index.html      | 1 -
 .../templates/volumes/volume_types/qos_specs/_index.html   | 3 +--
 .../identity/groups/templates/groups/_add_non_member.html  | 1 -
 .../access_and_security/api_access/_credentials.html       | 1 -
 .../templates/access_and_security/keypairs/download.html   | 1 -
 .../containers/templates/containers/_container_detail.html | 1 -
 .../project/containers/templates/containers/_copy.html     | 1 -
 .../project/containers/templates/containers/_create.html   | 1 -
 .../templates/containers/_create_pseudo_folder.html        | 1 -
 .../containers/templates/containers/_object_detail.html    | 1 -
 .../project/containers/templates/containers/_update.html   | 1 -
 .../project/containers/templates/containers/_upload.html   | 1 -
 .../project/containers/templates/containers/index.html     | 1 -
 .../firewalls/templates/firewalls/_firewall_details.html   | 1 -
 .../firewalls/templates/firewalls/_policy_details.html     | 1 -
 .../firewalls/templates/firewalls/_rule_details.html       | 1 -
 .../instances/templates/instances/_decryptpassword.html    | 1 -
 .../instances/templates/instances/_detail_console.html     | 1 -
 .../project/instances/templates/instances/_detail_log.html | 1 -
 .../instances/templates/instances/_detail_overview.html    | 1 -
 .../project/instances/templates/instances/_rebuild.html    | 1 -
 .../instances/templates/instances/serial_console.html      | 3 +--
 .../templates/network_topology/_create_router.html         | 1 -
 .../templates/network_topology/iframe.html                 | 2 --
 .../network_topology/templates/network_topology/index.html | 1 -
 .../project/networks/templates/networks/_create.html       | 1 -
 .../project/networks/templates/networks/create.html        | 1 -
 .../templates/networks/ports/_detail_overview.html         | 1 -
 .../templates/networks/subnets/_detail_overview.html       | 1 -
 .../templates/routers/extensions/routerroutes/_create.html | 1 -
 .../templates/routers/extensions/routerrules/_create.html  | 1 -
 .../project/routers/templates/routers/ports/_create.html   | 1 -
 .../routers/templates/routers/ports/_setgateway.html       | 1 -
 .../project/stacks/templates/stacks/_preview_details.html  | 1 -
 .../templates/volumes/backups/_detail_overview.html        | 1 -
 .../templates/volumes/snapshots/_detail_overview.html      | 1 -
 .../project/volumes/templates/volumes/volumes/_attach.html | 1 -
 .../templates/volumes/volumes/_create_snapshot.html        | 1 -
 .../templates/volumes/volumes/_detail_overview.html        | 1 -
 .../vpn/templates/vpn/_ipsecsiteconnection_details.html    | 1 -
 .../project/vpn/templates/vpn/_vpnservice_details.html     | 1 -
 openstack_dashboard/templates/403.html                     | 1 -
 openstack_dashboard/templates/404.html                     | 1 -
 openstack_dashboard/templates/_header.html                 | 1 -
 .../templates/context_selection/_project_list.html         | 1 -
 .../templates/context_selection/_region_list.html          | 1 -
 openstack_dashboard/templates/horizon/_script_i18n.html    | 1 -
 openstack_dashboard/templates/horizon/_scripts.html        | 2 --
 openstack_dashboard/themes/material/templates/_header.html | 1 -
 .../themes/material/templates/horizon/_sidebar.html        | 1 -
 tox.ini                                                    | 7 +------
 95 files changed, 13 insertions(+), 108 deletions(-)

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 %}
 <script type="text/javascript" src="{% url 'horizon:jsi18n' 'horizon' %}"></script>
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 %}
 
 <ul id="sidebar-accordion" class="nav nav-pills nav-stacked">
   {% for dashboard, panel_info in components %}
diff --git a/horizon/templates/horizon/common/_breadcrumb.html b/horizon/templates/horizon/common/_breadcrumb.html
index dd49ed7eea..0727454f9d 100644
--- a/horizon/templates/horizon/common/_breadcrumb.html
+++ b/horizon/templates/horizon/common/_breadcrumb.html
@@ -1,4 +1,3 @@
-{% load url from future %}
 {% load i18n %}
 {% with subfolders=breadcrumb.get_subfolders %}
 <ul class="breadcrumb">
diff --git a/horizon/templates/horizon/common/_data_table.html b/horizon/templates/horizon/common/_data_table.html
index b4e0213bc6..5385171afe 100644
--- a/horizon/templates/horizon/common/_data_table.html
+++ b/horizon/templates/horizon/common/_data_table.html
@@ -1,5 +1,4 @@
 {% load i18n %}
-{% load cycle from future %}
 {% with table.needs_form_wrapper as needs_form_wrapper %}
 <div class="table_wrapper">
   {% if needs_form_wrapper %}<form action="{{ table.get_full_url }}" method="POST">{% csrf_token %}{% endif %}
diff --git a/horizon/templates/horizon/common/_region_selector.html b/horizon/templates/horizon/common/_region_selector.html
index f3338a7814..a3a16dd9d6 100644
--- a/horizon/templates/horizon/common/_region_selector.html
+++ b/horizon/templates/horizon/common/_region_selector.html
@@ -1,4 +1,3 @@
-{% load url from future %}
 {% if regions.support %}
   <a href="#" class="dropdown-toggle" role="button" aria-expanded="false">
     {{ regions.current.name }}
diff --git a/horizon/templates/horizon/common/_sidebar.html b/horizon/templates/horizon/common/_sidebar.html
index d9bbcf8304..e23e14de8f 100644
--- a/horizon/templates/horizon/common/_sidebar.html
+++ b/horizon/templates/horizon/common/_sidebar.html
@@ -1,5 +1,4 @@
 {% load branding horizon i18n %}
-{% load url from future %}
 
 <div id='sidebar'>
   {% horizon_nav %}
diff --git a/horizon/templates/horizon/jasmine/jasmine.html b/horizon/templates/horizon/jasmine/jasmine.html
index 963335b5ca..ebd3f8057b 100644
--- a/horizon/templates/horizon/jasmine/jasmine.html
+++ b/horizon/templates/horizon/jasmine/jasmine.html
@@ -1,4 +1,3 @@
-{% load url from future %}
 <!DOCTYPE html>
 <html>
 <head>
diff --git a/horizon/utils/html.py b/horizon/utils/html.py
index da90daa57e..fe5c3c60be 100644
--- a/horizon/utils/html.py
+++ b/horizon/utils/html.py
@@ -12,7 +12,7 @@
 
 import copy
 
-from django.forms.util import flatatt  # noqa
+from django.forms.utils import flatatt  # noqa
 
 
 class HTMLElement(object):
diff --git a/openstack_dashboard/contrib/sahara/content/data_processing/cluster_templates/templates/data_processing.cluster_templates/_details.html b/openstack_dashboard/contrib/sahara/content/data_processing/cluster_templates/templates/data_processing.cluster_templates/_details.html
index f21deb9e97..63b0896252 100644
--- a/openstack_dashboard/contrib/sahara/content/data_processing/cluster_templates/templates/data_processing.cluster_templates/_details.html
+++ b/openstack_dashboard/contrib/sahara/content/data_processing/cluster_templates/templates/data_processing.cluster_templates/_details.html
@@ -1,5 +1,4 @@
 {% load i18n sizeformat %}
-{% load url from future %}
 
 <div class="detail">
   <dl class="dl-horizontal">
diff --git a/openstack_dashboard/contrib/sahara/content/data_processing/cluster_templates/templates/data_processing.cluster_templates/_nodegroups_details.html b/openstack_dashboard/contrib/sahara/content/data_processing/cluster_templates/templates/data_processing.cluster_templates/_nodegroups_details.html
index 6f0bf1a081..0dbcae1404 100644
--- a/openstack_dashboard/contrib/sahara/content/data_processing/cluster_templates/templates/data_processing.cluster_templates/_nodegroups_details.html
+++ b/openstack_dashboard/contrib/sahara/content/data_processing/cluster_templates/templates/data_processing.cluster_templates/_nodegroups_details.html
@@ -1,5 +1,4 @@
 {% load i18n sizeformat %}
-{% load url from future %}
 
 <div class="detail">
     {% for node_group in template.node_groups %}
diff --git a/openstack_dashboard/contrib/sahara/content/data_processing/cluster_templates/templates/data_processing.cluster_templates/_upload_file.html b/openstack_dashboard/contrib/sahara/content/data_processing/cluster_templates/templates/data_processing.cluster_templates/_upload_file.html
index 6d282ab056..9ad4e9f233 100644
--- a/openstack_dashboard/contrib/sahara/content/data_processing/cluster_templates/templates/data_processing.cluster_templates/_upload_file.html
+++ b/openstack_dashboard/contrib/sahara/content/data_processing/cluster_templates/templates/data_processing.cluster_templates/_upload_file.html
@@ -1,6 +1,5 @@
 {% extends "horizon/common/_modal_form.html" %}
 
-{% load url from future %}
 
 {% load i18n %}
 
@@ -21,4 +20,4 @@
 {% block modal-footer %}
     <input class="btn btn-primary pull-right" id="upload_file_btn" type="submit" value="{% trans "Upload" %}"/>
     <a href="{% url 'horizon:project:data_processing.cluster_templates:index' %}" class="btn btn-default secondary cancel close">{% trans "Cancel" %}</a>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/openstack_dashboard/contrib/sahara/content/data_processing/clusters/templates/data_processing.clusters/_create_cluster.html b/openstack_dashboard/contrib/sahara/content/data_processing/clusters/templates/data_processing.clusters/_create_cluster.html
index 9aca185c27..e9b8062b5c 100644
--- a/openstack_dashboard/contrib/sahara/content/data_processing/clusters/templates/data_processing.clusters/_create_cluster.html
+++ b/openstack_dashboard/contrib/sahara/content/data_processing/clusters/templates/data_processing.clusters/_create_cluster.html
@@ -1,6 +1,5 @@
 {% extends "horizon/common/_modal_form.html" %}
 
-{% load url from future %}
 
 {% load i18n %}
 
diff --git a/openstack_dashboard/contrib/sahara/content/data_processing/clusters/templates/data_processing.clusters/_details.html b/openstack_dashboard/contrib/sahara/content/data_processing/clusters/templates/data_processing.clusters/_details.html
index 60761dc9a1..7f7eeb4a14 100644
--- a/openstack_dashboard/contrib/sahara/content/data_processing/clusters/templates/data_processing.clusters/_details.html
+++ b/openstack_dashboard/contrib/sahara/content/data_processing/clusters/templates/data_processing.clusters/_details.html
@@ -1,5 +1,4 @@
 {% load i18n sizeformat %}
-{% load url from future %}
 
 <div class="detail">
   <dl class="dl-horizontal">
diff --git a/openstack_dashboard/contrib/sahara/content/data_processing/clusters/templates/data_processing.clusters/_nodegroups_details.html b/openstack_dashboard/contrib/sahara/content/data_processing/clusters/templates/data_processing.clusters/_nodegroups_details.html
index dcebb7e56d..2f57f8160c 100644
--- a/openstack_dashboard/contrib/sahara/content/data_processing/clusters/templates/data_processing.clusters/_nodegroups_details.html
+++ b/openstack_dashboard/contrib/sahara/content/data_processing/clusters/templates/data_processing.clusters/_nodegroups_details.html
@@ -1,6 +1,5 @@
 {% load i18n sizeformat %}
 
-{% load url from future %}
 
 <div class="detail">
     {% for node_group in cluster.node_groups %}
diff --git a/openstack_dashboard/contrib/sahara/content/data_processing/data_image_registry/templates/data_processing.data_image_registry/_edit_tags.html b/openstack_dashboard/contrib/sahara/content/data_processing/data_image_registry/templates/data_processing.data_image_registry/_edit_tags.html
index 85a87d42ef..0e2a54a056 100644
--- a/openstack_dashboard/contrib/sahara/content/data_processing/data_image_registry/templates/data_processing.data_image_registry/_edit_tags.html
+++ b/openstack_dashboard/contrib/sahara/content/data_processing/data_image_registry/templates/data_processing.data_image_registry/_edit_tags.html
@@ -1,6 +1,5 @@
 {% extends "horizon/common/_modal_form.html" %}
 
-{% load url from future %}
 
 {% load i18n %}
 
@@ -26,4 +25,4 @@
 {% block modal-footer %}
     <input class="btn btn-primary pull-right" id="edit_image_tags_btn" type="submit" value="{% trans "Done" %}"/>
     <a href="{% url 'horizon:project:data_processing.data_image_registry:index' %}" class="btn btn-default secondary cancel close">{% trans "Cancel" %}</a>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/openstack_dashboard/contrib/sahara/content/data_processing/data_image_registry/templates/data_processing.data_image_registry/_register_image.html b/openstack_dashboard/contrib/sahara/content/data_processing/data_image_registry/templates/data_processing.data_image_registry/_register_image.html
index b383072a2d..70460f4be6 100644
--- a/openstack_dashboard/contrib/sahara/content/data_processing/data_image_registry/templates/data_processing.data_image_registry/_register_image.html
+++ b/openstack_dashboard/contrib/sahara/content/data_processing/data_image_registry/templates/data_processing.data_image_registry/_register_image.html
@@ -1,6 +1,5 @@
 {% extends "horizon/common/_modal_form.html" %}
 
-{% load url from future %}
 
 {% load i18n %}
 
@@ -24,4 +23,4 @@
 {% block modal-footer %}
     <input class="btn btn-primary pull-right" id="edit_image_tags_btn" type="submit" value="{% trans "Done" %}"/>
     <a href="{% url 'horizon:project:data_processing.data_image_registry:index' %}" class="btn btn-default secondary cancel close">{% trans "Cancel" %}</a>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/openstack_dashboard/contrib/sahara/content/data_processing/job_binaries/templates/data_processing.job_binaries/_create.html b/openstack_dashboard/contrib/sahara/content/data_processing/job_binaries/templates/data_processing.job_binaries/_create.html
index 3c381614b5..888c001a29 100644
--- a/openstack_dashboard/contrib/sahara/content/data_processing/job_binaries/templates/data_processing.job_binaries/_create.html
+++ b/openstack_dashboard/contrib/sahara/content/data_processing/job_binaries/templates/data_processing.job_binaries/_create.html
@@ -1,6 +1,5 @@
 {% extends "horizon/common/_modal_form.html" %}
 
-{% load url from future %}
 
 {% load i18n %}
 
diff --git a/openstack_dashboard/contrib/sahara/content/data_processing/job_executions/templates/data_processing.job_executions/_details.html b/openstack_dashboard/contrib/sahara/content/data_processing/job_executions/templates/data_processing.job_executions/_details.html
index 681770b067..82bcf63193 100644
--- a/openstack_dashboard/contrib/sahara/content/data_processing/job_executions/templates/data_processing.job_executions/_details.html
+++ b/openstack_dashboard/contrib/sahara/content/data_processing/job_executions/templates/data_processing.job_executions/_details.html
@@ -1,5 +1,5 @@
 {% load i18n sizeformat %}
-{% load url from future %}
+
 <div class="detail">
   <dl class="dl-horizontal">
     <dt>{% trans "Status" %}</dt>
diff --git a/openstack_dashboard/contrib/sahara/content/data_processing/jobs/templates/data_processing.jobs/_details.html b/openstack_dashboard/contrib/sahara/content/data_processing/jobs/templates/data_processing.jobs/_details.html
index 5db672dbe3..723e649565 100644
--- a/openstack_dashboard/contrib/sahara/content/data_processing/jobs/templates/data_processing.jobs/_details.html
+++ b/openstack_dashboard/contrib/sahara/content/data_processing/jobs/templates/data_processing.jobs/_details.html
@@ -1,5 +1,4 @@
 {% load i18n sizeformat %}
-{% load url from future %}
 
 <div class="detail">
   <dl class="dl-horizontal">
diff --git a/openstack_dashboard/contrib/sahara/content/data_processing/nodegroup_templates/templates/data_processing.nodegroup_templates/_details.html b/openstack_dashboard/contrib/sahara/content/data_processing/nodegroup_templates/templates/data_processing.nodegroup_templates/_details.html
index 28f5020b12..fe92f18b7d 100644
--- a/openstack_dashboard/contrib/sahara/content/data_processing/nodegroup_templates/templates/data_processing.nodegroup_templates/_details.html
+++ b/openstack_dashboard/contrib/sahara/content/data_processing/nodegroup_templates/templates/data_processing.nodegroup_templates/_details.html
@@ -1,5 +1,4 @@
 {% load i18n sizeformat %}
-{% load url from future %}
 
 <div class="detail">
     <dl class="dl-horizontal">
diff --git a/openstack_dashboard/contrib/sahara/content/data_processing/wizard/templates/data_processing.wizard/_job_type_select.html b/openstack_dashboard/contrib/sahara/content/data_processing/wizard/templates/data_processing.wizard/_job_type_select.html
index 10bf09a315..e49c35de2e 100644
--- a/openstack_dashboard/contrib/sahara/content/data_processing/wizard/templates/data_processing.wizard/_job_type_select.html
+++ b/openstack_dashboard/contrib/sahara/content/data_processing/wizard/templates/data_processing.wizard/_job_type_select.html
@@ -1,6 +1,5 @@
 {% extends "horizon/common/_modal_form.html" %}
 
-{% load url from future %}
 
 {% load i18n %}
 
@@ -28,4 +27,4 @@
            type="submit" value="{% trans "Select" %}"/>
     <a href="{% url 'horizon:project:data_processing.wizard:jobex_guide' %}"
        class="btn btn-default secondary cancel close">{% trans "Cancel" %}</a>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/openstack_dashboard/contrib/sahara/content/data_processing/wizard/templates/data_processing.wizard/_plugin_select.html b/openstack_dashboard/contrib/sahara/content/data_processing/wizard/templates/data_processing.wizard/_plugin_select.html
index 5e6630905e..a385de5a3e 100644
--- a/openstack_dashboard/contrib/sahara/content/data_processing/wizard/templates/data_processing.wizard/_plugin_select.html
+++ b/openstack_dashboard/contrib/sahara/content/data_processing/wizard/templates/data_processing.wizard/_plugin_select.html
@@ -1,6 +1,5 @@
 {% extends "horizon/common/_modal_form.html" %}
 
-{% load url from future %}
 
 {% load i18n %}
 
@@ -28,4 +27,4 @@
            type="submit" value="{% trans "Select" %}"/>
     <a href="{% url 'horizon:project:data_processing.wizard:cluster_guide' %}"
        class="btn btn-default secondary cancel close">{% trans "Cancel" %}</a>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/openstack_dashboard/contrib/sahara/content/data_processing/wizard/templates/data_processing.wizard/cluster_guide.html b/openstack_dashboard/contrib/sahara/content/data_processing/wizard/templates/data_processing.wizard/cluster_guide.html
index 1b6bb33fa7..a7409c8dfd 100644
--- a/openstack_dashboard/contrib/sahara/content/data_processing/wizard/templates/data_processing.wizard/cluster_guide.html
+++ b/openstack_dashboard/contrib/sahara/content/data_processing/wizard/templates/data_processing.wizard/cluster_guide.html
@@ -1,6 +1,5 @@
 {% extends 'base.html' %}
 {% load i18n %}
-{% load url from future %}
 {% block title %}{% trans "Data Processing" %}{% endblock %}
 
 {% block main %}
diff --git a/openstack_dashboard/contrib/sahara/content/data_processing/wizard/templates/data_processing.wizard/jobex_guide.html b/openstack_dashboard/contrib/sahara/content/data_processing/wizard/templates/data_processing.wizard/jobex_guide.html
index 739091edf9..70af347548 100644
--- a/openstack_dashboard/contrib/sahara/content/data_processing/wizard/templates/data_processing.wizard/jobex_guide.html
+++ b/openstack_dashboard/contrib/sahara/content/data_processing/wizard/templates/data_processing.wizard/jobex_guide.html
@@ -1,6 +1,5 @@
 {% extends 'base.html' %}
 {% load i18n %}
-{% load url from future %}
 {% block title %}{% trans "Data Processing" %}{% endblock %}
 
 {% block main %}
diff --git a/openstack_dashboard/contrib/sahara/content/data_processing/wizard/templates/data_processing.wizard/wizard.html b/openstack_dashboard/contrib/sahara/content/data_processing/wizard/templates/data_processing.wizard/wizard.html
index 768f5b25bc..555aa238f6 100644
--- a/openstack_dashboard/contrib/sahara/content/data_processing/wizard/templates/data_processing.wizard/wizard.html
+++ b/openstack_dashboard/contrib/sahara/content/data_processing/wizard/templates/data_processing.wizard/wizard.html
@@ -1,6 +1,5 @@
 {% extends 'base.html' %}
 {% load i18n %}
-{% load url from future %}
 {% block title %}{% trans "Data Processing" %}{% endblock %}
 
 {% block main %}
diff --git a/openstack_dashboard/contrib/sahara/content/data_processing/wizard/views.py b/openstack_dashboard/contrib/sahara/content/data_processing/wizard/views.py
index c07301a362..98d819118a 100644
--- a/openstack_dashboard/contrib/sahara/content/data_processing/wizard/views.py
+++ b/openstack_dashboard/contrib/sahara/content/data_processing/wizard/views.py
@@ -50,6 +50,7 @@ class ClusterGuideView(horizon_views.APIView):
 
 class ResetClusterGuideView(generic.RedirectView):
     pattern_name = 'horizon:project:data_processing.wizard:cluster_guide'
+    permanent = True
 
     def get(self, request, *args, **kwargs):
         if kwargs["reset_cluster_guide"]:
@@ -74,6 +75,7 @@ class JobExecutionGuideView(horizon_views.APIView):
 
 class ResetJobExGuideView(generic.RedirectView):
     pattern_name = 'horizon:project:data_processing.wizard:jobex_guide'
+    permanent = True
 
     def get(self, request, *args, **kwargs):
         if kwargs["reset_jobex_guide"]:
diff --git a/openstack_dashboard/contrib/trove/content/databases/templates/databases/_detail_overview.html b/openstack_dashboard/contrib/trove/content/databases/templates/databases/_detail_overview.html
index a873c1bf91..212f5209a2 100644
--- a/openstack_dashboard/contrib/trove/content/databases/templates/databases/_detail_overview.html
+++ b/openstack_dashboard/contrib/trove/content/databases/templates/databases/_detail_overview.html
@@ -1,5 +1,4 @@
 {% load i18n sizeformat %}
-{% load url from future %}
 
 <div class="detail">
   <dl class="dl-horizontal">
diff --git a/openstack_dashboard/contrib/trove/content/databases/templates/databases/_resize_instance.html b/openstack_dashboard/contrib/trove/content/databases/templates/databases/_resize_instance.html
index 8de3c3390f..48d64d86ba 100644
--- a/openstack_dashboard/contrib/trove/content/databases/templates/databases/_resize_instance.html
+++ b/openstack_dashboard/contrib/trove/content/databases/templates/databases/_resize_instance.html
@@ -1,6 +1,5 @@
 {% extends "horizon/common/_modal_form.html" %}
 {% load i18n %}
-{% load url from future %}
 
 {% block form_id %}resize_instance_form{% endblock %}
 {% block form_action %}{% url "horizon:project:databases:resize_instance" instance_id %}{% endblock %}
diff --git a/openstack_dashboard/contrib/trove/content/databases/templates/databases/_resize_volume.html b/openstack_dashboard/contrib/trove/content/databases/templates/databases/_resize_volume.html
index b9a3661331..fcc212fcac 100644
--- a/openstack_dashboard/contrib/trove/content/databases/templates/databases/_resize_volume.html
+++ b/openstack_dashboard/contrib/trove/content/databases/templates/databases/_resize_volume.html
@@ -1,6 +1,5 @@
 {% extends "horizon/common/_modal_form.html" %}
 {% load i18n %}
-{% load url from future %}
 
 {% block form_id %}resize_volume_form{% endblock %}
 {% block form_action %}{% url "horizon:project:databases:resize_volume" instance_id %}{% endblock %}
diff --git a/openstack_dashboard/dashboards/admin/aggregates/templates/aggregates/_update.html b/openstack_dashboard/dashboards/admin/aggregates/templates/aggregates/_update.html
index 0ea211add3..4788f05797 100644
--- a/openstack_dashboard/dashboards/admin/aggregates/templates/aggregates/_update.html
+++ b/openstack_dashboard/dashboards/admin/aggregates/templates/aggregates/_update.html
@@ -1,6 +1,5 @@
 {% extends "horizon/common/_modal_form.html" %}
 {% load i18n %}
-{% load url from future %}
 
 {% block form_id %}edit_aggregate_form{% endblock %}
 {% block form_action %}{% url 'horizon:admin:aggregates:update' id %}{% endblock %}
diff --git a/openstack_dashboard/dashboards/admin/hypervisors/templates/hypervisors/compute/_disable_service.html b/openstack_dashboard/dashboards/admin/hypervisors/templates/hypervisors/compute/_disable_service.html
index 6cd9b850f4..59e3ff908f 100644
--- a/openstack_dashboard/dashboards/admin/hypervisors/templates/hypervisors/compute/_disable_service.html
+++ b/openstack_dashboard/dashboards/admin/hypervisors/templates/hypervisors/compute/_disable_service.html
@@ -1,6 +1,5 @@
 {% extends "horizon/common/_modal_form.html" %}
 {% load i18n %}
-{% load url from future %}
 
 {% block form_id %}disable_service_form{% endblock %}
 {% block form_action %}{% url 'horizon:admin:hypervisors:compute:disable_service' compute_host %}{% endblock %}
diff --git a/openstack_dashboard/dashboards/admin/hypervisors/templates/hypervisors/compute/_evacuate_host.html b/openstack_dashboard/dashboards/admin/hypervisors/templates/hypervisors/compute/_evacuate_host.html
index eb94654cef..4e55249768 100644
--- a/openstack_dashboard/dashboards/admin/hypervisors/templates/hypervisors/compute/_evacuate_host.html
+++ b/openstack_dashboard/dashboards/admin/hypervisors/templates/hypervisors/compute/_evacuate_host.html
@@ -1,6 +1,5 @@
 {% extends "horizon/common/_modal_form.html" %}
 {% load i18n %}
-{% load url from future %}
 
 {% block form_id %}evacuate_host_form{% endblock %}
 {% block form_action %}{% url 'horizon:admin:hypervisors:compute:evacuate_host' compute_host %}{% endblock %}
diff --git a/openstack_dashboard/dashboards/admin/hypervisors/templates/hypervisors/compute/_migrate_host.html b/openstack_dashboard/dashboards/admin/hypervisors/templates/hypervisors/compute/_migrate_host.html
index cbaa6d287d..ad36eef7d9 100644
--- a/openstack_dashboard/dashboards/admin/hypervisors/templates/hypervisors/compute/_migrate_host.html
+++ b/openstack_dashboard/dashboards/admin/hypervisors/templates/hypervisors/compute/_migrate_host.html
@@ -1,6 +1,5 @@
 {% extends "horizon/common/_modal_form.html" %}
 {% load i18n %}
-{% load url from future %}
 
 {% block form_id %}evacuate_host_form{% endblock %}
 {% block form_action %}{% url 'horizon:admin:hypervisors:compute:migrate_host' compute_host %}{% endblock %}
diff --git a/openstack_dashboard/dashboards/admin/instances/templates/instances/_live_migrate.html b/openstack_dashboard/dashboards/admin/instances/templates/instances/_live_migrate.html
index 2a5d4ab667..789f6d559a 100644
--- a/openstack_dashboard/dashboards/admin/instances/templates/instances/_live_migrate.html
+++ b/openstack_dashboard/dashboards/admin/instances/templates/instances/_live_migrate.html
@@ -1,6 +1,5 @@
 {% extends "horizon/common/_modal_form.html" %}
 {% load i18n %}
-{% load url from future %}
 
 {% block form_id %}live_migrate_form{% endblock %}
 {% block form_action %}{% url 'horizon:admin:instances:live_migrate' instance_id %}{% endblock %}
diff --git a/openstack_dashboard/dashboards/admin/metadata_defs/templates/metadata_defs/_create.html b/openstack_dashboard/dashboards/admin/metadata_defs/templates/metadata_defs/_create.html
index 9cdaabffcf..760518d4ab 100644
--- a/openstack_dashboard/dashboards/admin/metadata_defs/templates/metadata_defs/_create.html
+++ b/openstack_dashboard/dashboards/admin/metadata_defs/templates/metadata_defs/_create.html
@@ -1,6 +1,5 @@
 {% extends "horizon/common/_modal_form.html" %}
 {% load i18n %}
-{% load url from future %}
 
 {% block form_id %}create_metadata_form{% endblock %}
 {% block form_action %}{% url 'horizon:admin:metadata_defs:create' %}{% endblock %}
diff --git a/openstack_dashboard/dashboards/admin/metadata_defs/templates/metadata_defs/_resource_types.html b/openstack_dashboard/dashboards/admin/metadata_defs/templates/metadata_defs/_resource_types.html
index 0a0e53d1d5..1dee5f2a86 100644
--- a/openstack_dashboard/dashboards/admin/metadata_defs/templates/metadata_defs/_resource_types.html
+++ b/openstack_dashboard/dashboards/admin/metadata_defs/templates/metadata_defs/_resource_types.html
@@ -1,6 +1,5 @@
 {% extends 'admin/metadata_defs/resource_types.html' %}
 {% load i18n %}
-{% load url from future %}
 {% block title %}
   {% trans "Namespace Resource Type Associations" %}{% endblock %}
 
diff --git a/openstack_dashboard/dashboards/admin/metering/templates/metering/_daily.html b/openstack_dashboard/dashboards/admin/metering/templates/metering/_daily.html
index fbdcb315e9..aa40104d73 100644
--- a/openstack_dashboard/dashboards/admin/metering/templates/metering/_daily.html
+++ b/openstack_dashboard/dashboards/admin/metering/templates/metering/_daily.html
@@ -1,6 +1,5 @@
 {% extends "horizon/common/_modal_form.html" %}
 {% load i18n %}
-{% load url from future %}
 
 {% block form_id %}create_usage_report_form{% endblock %}
 {% block form_action %}{% url 'horizon:admin:metering:create' %}{% endblock %}
diff --git a/openstack_dashboard/dashboards/admin/metering/templates/metering/stats.html b/openstack_dashboard/dashboards/admin/metering/templates/metering/stats.html
index 47eea47b77..c459a0157b 100644
--- a/openstack_dashboard/dashboards/admin/metering/templates/metering/stats.html
+++ b/openstack_dashboard/dashboards/admin/metering/templates/metering/stats.html
@@ -1,5 +1,4 @@
 {% load i18n %}
-{% load url from future %}
 
 <div id="samples_url" url="{% url "horizon:admin:metering:samples" %}"></div>
 <div id="ceilometer-stats">
diff --git a/openstack_dashboard/dashboards/admin/networks/templates/networks/_create.html b/openstack_dashboard/dashboards/admin/networks/templates/networks/_create.html
index f7289464a1..6c726fbd4b 100644
--- a/openstack_dashboard/dashboards/admin/networks/templates/networks/_create.html
+++ b/openstack_dashboard/dashboards/admin/networks/templates/networks/_create.html
@@ -1,6 +1,5 @@
 {% extends "horizon/common/_modal_form.html" %}
 {% load i18n %}
-{% load url from future %}
 
 {% block form_id %}create_network_form{% endblock %}
 {% block form_action %}{% url 'horizon:admin:networks:create' %}{% endblock %}
diff --git a/openstack_dashboard/dashboards/admin/networks/templates/networks/ports/_detail_overview.html b/openstack_dashboard/dashboards/admin/networks/templates/networks/ports/_detail_overview.html
index ee296f4d3c..74fa19368d 100644
--- a/openstack_dashboard/dashboards/admin/networks/templates/networks/ports/_detail_overview.html
+++ b/openstack_dashboard/dashboards/admin/networks/templates/networks/ports/_detail_overview.html
@@ -1,5 +1,4 @@
 {% load i18n sizeformat %}
-{% load url from future %}
 
 <div class="detail">
   <dl class="dl-horizontal">
diff --git a/openstack_dashboard/dashboards/admin/volumes/templates/volumes/snapshots/_detail_overview.html b/openstack_dashboard/dashboards/admin/volumes/templates/volumes/snapshots/_detail_overview.html
index e61e872751..4d7e3aa62a 100644
--- a/openstack_dashboard/dashboards/admin/volumes/templates/volumes/snapshots/_detail_overview.html
+++ b/openstack_dashboard/dashboards/admin/volumes/templates/volumes/snapshots/_detail_overview.html
@@ -1,5 +1,4 @@
 {% load i18n sizeformat parse_date %}
-{% load url from future %}
 
 <h3>{% trans "Volume Snapshot Overview" %}</h3>
 
diff --git a/openstack_dashboard/dashboards/admin/volumes/templates/volumes/volume_types/_update_volume_type.html b/openstack_dashboard/dashboards/admin/volumes/templates/volumes/volume_types/_update_volume_type.html
index 66e3428c43..e58768cc57 100644
--- a/openstack_dashboard/dashboards/admin/volumes/templates/volumes/volume_types/_update_volume_type.html
+++ b/openstack_dashboard/dashboards/admin/volumes/templates/volumes/volume_types/_update_volume_type.html
@@ -1,6 +1,5 @@
 {% extends "horizon/common/_modal_form.html" %}
 {% load i18n %}
-{% load url from future %}
 
 {% block form_id %}{% endblock %}
 {% block form_action %}{% url 'horizon:admin:volumes:volume_types:update_type' volume_type.id %}{% endblock %}
diff --git a/openstack_dashboard/dashboards/admin/volumes/templates/volumes/volume_types/extras/_index.html b/openstack_dashboard/dashboards/admin/volumes/templates/volumes/volume_types/extras/_index.html
index b79f34a7fb..723d633b58 100644
--- a/openstack_dashboard/dashboards/admin/volumes/templates/volumes/volume_types/extras/_index.html
+++ b/openstack_dashboard/dashboards/admin/volumes/templates/volumes/volume_types/extras/_index.html
@@ -1,6 +1,5 @@
 {% extends "horizon/common/_modal.html" %}
 {% load i18n %}
-{% load url from future %}
 
 {% block modal_id %}extra_specs_modal{% endblock %}
 {% block modal-header %}{% trans "Volume Type Extra Specs" %}{% endblock %}
diff --git a/openstack_dashboard/dashboards/admin/volumes/templates/volumes/volume_types/qos_specs/_index.html b/openstack_dashboard/dashboards/admin/volumes/templates/volumes/volume_types/qos_specs/_index.html
index 357495d04e..7491f0ed25 100644
--- a/openstack_dashboard/dashboards/admin/volumes/templates/volumes/volume_types/qos_specs/_index.html
+++ b/openstack_dashboard/dashboards/admin/volumes/templates/volumes/volume_types/qos_specs/_index.html
@@ -1,6 +1,5 @@
 {% extends "horizon/common/_modal.html" %}
 {% load i18n %}
-{% load url from future %}
 
 {% block modal_id %}qos_specs_modal{% endblock %}
 
@@ -12,4 +11,4 @@
 
 {% block modal-footer %}
   <a href="{% url 'horizon:admin:volumes:volume_types_tab' %}" class="btn btn-default secondary cancel close">{% trans "Close" %}</a>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/openstack_dashboard/dashboards/identity/groups/templates/groups/_add_non_member.html b/openstack_dashboard/dashboards/identity/groups/templates/groups/_add_non_member.html
index 4e49ca0596..c6ccb05ea3 100644
--- a/openstack_dashboard/dashboards/identity/groups/templates/groups/_add_non_member.html
+++ b/openstack_dashboard/dashboards/identity/groups/templates/groups/_add_non_member.html
@@ -1,6 +1,5 @@
 {% extends "horizon/common/_modal_form_add_members.html" %}
 {% load i18n %}
-{% load url from future %}
 
 {% block modal-header %}{% trans "Add Group Assignment" %}{% endblock %}
 
diff --git a/openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/api_access/_credentials.html b/openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/api_access/_credentials.html
index ffc3b74fee..85cec091a4 100644
--- a/openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/api_access/_credentials.html
+++ b/openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/api_access/_credentials.html
@@ -1,6 +1,5 @@
 {% extends "horizon/common/_modal.html" %}
 {% load i18n %}
-{% load url from future %}
 
 {% block modal-header %}{% trans "User Credentials" %}{% endblock %}
 
diff --git a/openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/keypairs/download.html b/openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/keypairs/download.html
index 9eac85b817..fcfd855ddf 100644
--- a/openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/keypairs/download.html
+++ b/openstack_dashboard/dashboards/project/access_and_security/templates/access_and_security/keypairs/download.html
@@ -1,6 +1,5 @@
 {% extends 'base.html' %}
 {% load i18n %}
-{% load url from future %}
 {% block title %}{% blocktrans %}Download Key Pair{% endblocktrans %}{% endblock %}
 
 {% block main %}
diff --git a/openstack_dashboard/dashboards/project/containers/templates/containers/_container_detail.html b/openstack_dashboard/dashboards/project/containers/templates/containers/_container_detail.html
index bc3c668d4a..bf4cc9c046 100644
--- a/openstack_dashboard/dashboards/project/containers/templates/containers/_container_detail.html
+++ b/openstack_dashboard/dashboards/project/containers/templates/containers/_container_detail.html
@@ -1,6 +1,5 @@
 {% extends "horizon/common/_modal.html" %}
 {% load i18n %}
-{% load url from future %}
 
 {% block modal-header %}{% trans "Container Details" %}{% endblock %}
 
diff --git a/openstack_dashboard/dashboards/project/containers/templates/containers/_copy.html b/openstack_dashboard/dashboards/project/containers/templates/containers/_copy.html
index 18824fe4f5..f2a9d9023b 100644
--- a/openstack_dashboard/dashboards/project/containers/templates/containers/_copy.html
+++ b/openstack_dashboard/dashboards/project/containers/templates/containers/_copy.html
@@ -1,6 +1,5 @@
 {% extends "horizon/common/_modal_form.html" %}
 {% load i18n %}
-{% load url from future %}
 
 {% block form_id %}copy_object_form{% endblock %}
 {% block form_action %}{% url 'horizon:project:containers:object_copy' container_name object_name %}{% endblock %}
diff --git a/openstack_dashboard/dashboards/project/containers/templates/containers/_create.html b/openstack_dashboard/dashboards/project/containers/templates/containers/_create.html
index 6805530a5b..bf0f2adb99 100644
--- a/openstack_dashboard/dashboards/project/containers/templates/containers/_create.html
+++ b/openstack_dashboard/dashboards/project/containers/templates/containers/_create.html
@@ -1,6 +1,5 @@
 {% extends "horizon/common/_modal_form.html" %}
 {% load i18n %}
-{% load url from future %}
 
 {% block form_id %}create_container_form{% endblock %}
 {% block form_action %}{% url 'horizon:project:containers:create' %}{% endblock %}
diff --git a/openstack_dashboard/dashboards/project/containers/templates/containers/_create_pseudo_folder.html b/openstack_dashboard/dashboards/project/containers/templates/containers/_create_pseudo_folder.html
index 14e900dc7d..098a09ee17 100644
--- a/openstack_dashboard/dashboards/project/containers/templates/containers/_create_pseudo_folder.html
+++ b/openstack_dashboard/dashboards/project/containers/templates/containers/_create_pseudo_folder.html
@@ -1,6 +1,5 @@
 {% extends "horizon/common/_modal_form.html" %}
 {% load i18n %}
-{% load url from future %}
 
 {% block form_id %}create_directory_form{% endblock %}
 {% block form_action %}{% url 'horizon:project:containers:create_pseudo_folder' container_name %}{% endblock %}
diff --git a/openstack_dashboard/dashboards/project/containers/templates/containers/_object_detail.html b/openstack_dashboard/dashboards/project/containers/templates/containers/_object_detail.html
index f6a0af418f..a4dd95e000 100644
--- a/openstack_dashboard/dashboards/project/containers/templates/containers/_object_detail.html
+++ b/openstack_dashboard/dashboards/project/containers/templates/containers/_object_detail.html
@@ -1,6 +1,5 @@
 {% extends "horizon/common/_modal.html" %}
 {% load i18n %}
-{% load url from future %}
 
 {% block modal-header %}{% trans "Object Details" %}{% endblock %}
 
diff --git a/openstack_dashboard/dashboards/project/containers/templates/containers/_update.html b/openstack_dashboard/dashboards/project/containers/templates/containers/_update.html
index 7723a650b7..4878637e96 100644
--- a/openstack_dashboard/dashboards/project/containers/templates/containers/_update.html
+++ b/openstack_dashboard/dashboards/project/containers/templates/containers/_update.html
@@ -1,6 +1,5 @@
 {% extends "horizon/common/_modal_form.html" %}
 {% load i18n %}
-{% load url from future %}
 
 {% block form_id %}update_object_form{% endblock %}
 {% block ng_controller %}DummyController{% endblock %}
diff --git a/openstack_dashboard/dashboards/project/containers/templates/containers/_upload.html b/openstack_dashboard/dashboards/project/containers/templates/containers/_upload.html
index e7d2f6b02b..6b5336d99d 100644
--- a/openstack_dashboard/dashboards/project/containers/templates/containers/_upload.html
+++ b/openstack_dashboard/dashboards/project/containers/templates/containers/_upload.html
@@ -1,6 +1,5 @@
 {% extends "horizon/common/_modal_form.html" %}
 {% load i18n %}
-{% load url from future %}
 
 {% block form_id %}upload_object_form{% endblock %}
 {% block form_name %}uploadForm{% endblock %}
diff --git a/openstack_dashboard/dashboards/project/containers/templates/containers/index.html b/openstack_dashboard/dashboards/project/containers/templates/containers/index.html
index b81866235a..f38534198c 100644
--- a/openstack_dashboard/dashboards/project/containers/templates/containers/index.html
+++ b/openstack_dashboard/dashboards/project/containers/templates/containers/index.html
@@ -1,6 +1,5 @@
 {% extends 'base.html' %}
 {% load i18n %}
-{% load url from future %}
 
 {% block title %}{% trans "Containers" %}{% endblock %}
 
diff --git a/openstack_dashboard/dashboards/project/firewalls/templates/firewalls/_firewall_details.html b/openstack_dashboard/dashboards/project/firewalls/templates/firewalls/_firewall_details.html
index ccbeec737a..5efb7a24c5 100644
--- a/openstack_dashboard/dashboards/project/firewalls/templates/firewalls/_firewall_details.html
+++ b/openstack_dashboard/dashboards/project/firewalls/templates/firewalls/_firewall_details.html
@@ -1,5 +1,4 @@
 {% load i18n sizeformat parse_date %}
-{% load url from future %}
 
 <div class="detail">
   <dl class="dl-horizontal">
diff --git a/openstack_dashboard/dashboards/project/firewalls/templates/firewalls/_policy_details.html b/openstack_dashboard/dashboards/project/firewalls/templates/firewalls/_policy_details.html
index 19ef4efcff..36b99e1dd4 100644
--- a/openstack_dashboard/dashboards/project/firewalls/templates/firewalls/_policy_details.html
+++ b/openstack_dashboard/dashboards/project/firewalls/templates/firewalls/_policy_details.html
@@ -1,5 +1,4 @@
 {% load i18n sizeformat parse_date %}
-{% load url from future %}
 
 <div class="detail">
   <dl class="dl-horizontal">
diff --git a/openstack_dashboard/dashboards/project/firewalls/templates/firewalls/_rule_details.html b/openstack_dashboard/dashboards/project/firewalls/templates/firewalls/_rule_details.html
index d95d799da3..85d4bc730b 100644
--- a/openstack_dashboard/dashboards/project/firewalls/templates/firewalls/_rule_details.html
+++ b/openstack_dashboard/dashboards/project/firewalls/templates/firewalls/_rule_details.html
@@ -1,5 +1,4 @@
 {% load i18n sizeformat parse_date %}
-{% load url from future %}
 
 <div class="detail">
   <dl class="dl-horizontal">
diff --git a/openstack_dashboard/dashboards/project/instances/templates/instances/_decryptpassword.html b/openstack_dashboard/dashboards/project/instances/templates/instances/_decryptpassword.html
index 8b4ee9ba63..dbdc43ecce 100644
--- a/openstack_dashboard/dashboards/project/instances/templates/instances/_decryptpassword.html
+++ b/openstack_dashboard/dashboards/project/instances/templates/instances/_decryptpassword.html
@@ -1,6 +1,5 @@
 {% extends "horizon/common/_modal_form.html" %}
 {% load i18n %}
-{% load url from future %}
 
 {% block form_id %}password_instance_form{% endblock %}
 
diff --git a/openstack_dashboard/dashboards/project/instances/templates/instances/_detail_console.html b/openstack_dashboard/dashboards/project/instances/templates/instances/_detail_console.html
index 28cddcc6e9..21b67a9b1e 100644
--- a/openstack_dashboard/dashboards/project/instances/templates/instances/_detail_console.html
+++ b/openstack_dashboard/dashboards/project/instances/templates/instances/_detail_console.html
@@ -1,5 +1,4 @@
 {% load i18n %}
-{% load url from future %}
 
 <h3>{% trans "Instance Console" %}</h3>
 {% if console_url %}
diff --git a/openstack_dashboard/dashboards/project/instances/templates/instances/_detail_log.html b/openstack_dashboard/dashboards/project/instances/templates/instances/_detail_log.html
index 33877e1917..5a151efc4a 100644
--- a/openstack_dashboard/dashboards/project/instances/templates/instances/_detail_log.html
+++ b/openstack_dashboard/dashboards/project/instances/templates/instances/_detail_log.html
@@ -1,5 +1,4 @@
 {% load i18n %}
-{% load url from future %}
 
 <div class="clearfix">
   <h3 class="pull-left">{% trans "Instance Console Log" %}</h3>
diff --git a/openstack_dashboard/dashboards/project/instances/templates/instances/_detail_overview.html b/openstack_dashboard/dashboards/project/instances/templates/instances/_detail_overview.html
index 3f75ad8fec..87b01a5399 100644
--- a/openstack_dashboard/dashboards/project/instances/templates/instances/_detail_overview.html
+++ b/openstack_dashboard/dashboards/project/instances/templates/instances/_detail_overview.html
@@ -1,5 +1,4 @@
 {% load i18n sizeformat %}
-{% load url from future %}
 
 <div class="detail">
   <dl class="dl-horizontal">
diff --git a/openstack_dashboard/dashboards/project/instances/templates/instances/_rebuild.html b/openstack_dashboard/dashboards/project/instances/templates/instances/_rebuild.html
index d77a3eb720..a8522dccb0 100644
--- a/openstack_dashboard/dashboards/project/instances/templates/instances/_rebuild.html
+++ b/openstack_dashboard/dashboards/project/instances/templates/instances/_rebuild.html
@@ -1,6 +1,5 @@
 {% extends "horizon/common/_modal_form.html" %}
 {% load i18n %}
-{% load url from future %}
 
 {% block form_id %}rebuild_instance_form{% endblock %}
 {% block form_action %}{% url "horizon:project:instances:rebuild" instance_id %}{% endblock %}
diff --git a/openstack_dashboard/dashboards/project/instances/templates/instances/serial_console.html b/openstack_dashboard/dashboards/project/instances/templates/instances/serial_console.html
index c24fbe27e6..e845ab09f6 100644
--- a/openstack_dashboard/dashboards/project/instances/templates/instances/serial_console.html
+++ b/openstack_dashboard/dashboards/project/instances/templates/instances/serial_console.html
@@ -1,5 +1,4 @@
 {% load i18n %}
-{% load url from future %}
 <!DOCTYPE html>
 <html>
 <head>
@@ -22,4 +21,4 @@
     {% endif %}
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/openstack_dashboard/dashboards/project/network_topology/templates/network_topology/_create_router.html b/openstack_dashboard/dashboards/project/network_topology/templates/network_topology/_create_router.html
index 61e26e2678..f19ee09569 100644
--- a/openstack_dashboard/dashboards/project/network_topology/templates/network_topology/_create_router.html
+++ b/openstack_dashboard/dashboards/project/network_topology/templates/network_topology/_create_router.html
@@ -1,6 +1,5 @@
 {% extends "horizon/common/_modal_form.html" %}
 {% load i18n horizon humanize %}
-{% load url from future %}
 
 {% block form_id %}{% endblock %}
 {% block form_action %}{% url 'horizon:project:network_topology:createrouter' %}?{{ request.GET.urlencode }}{% endblock %}
diff --git a/openstack_dashboard/dashboards/project/network_topology/templates/network_topology/iframe.html b/openstack_dashboard/dashboards/project/network_topology/templates/network_topology/iframe.html
index 2b52ce8930..63ad0d1145 100644
--- a/openstack_dashboard/dashboards/project/network_topology/templates/network_topology/iframe.html
+++ b/openstack_dashboard/dashboards/project/network_topology/templates/network_topology/iframe.html
@@ -1,5 +1,3 @@
-{% load firstof from future %}
-
 <!DOCTYPE html>
 <html>
   <head>
diff --git a/openstack_dashboard/dashboards/project/network_topology/templates/network_topology/index.html b/openstack_dashboard/dashboards/project/network_topology/templates/network_topology/index.html
index 5fe2e07837..6480e0b036 100644
--- a/openstack_dashboard/dashboards/project/network_topology/templates/network_topology/index.html
+++ b/openstack_dashboard/dashboards/project/network_topology/templates/network_topology/index.html
@@ -1,6 +1,5 @@
 {% extends 'base.html' %}
 {% load i18n %}
-{% load url from future %}
 {% block title %}{% trans "Network Topology" %}{% endblock %}
 
 {% block main %}
diff --git a/openstack_dashboard/dashboards/project/networks/templates/networks/_create.html b/openstack_dashboard/dashboards/project/networks/templates/networks/_create.html
index 4804e2ff6b..915bc60eea 100644
--- a/openstack_dashboard/dashboards/project/networks/templates/networks/_create.html
+++ b/openstack_dashboard/dashboards/project/networks/templates/networks/_create.html
@@ -1,6 +1,5 @@
 {% extends "horizon/common/_modal_form.html" %}
 {% load i18n %}
-{% load url from future %}
 
 {% block form_id %}create_network_form{% endblock %}
 {% block form_action %}{% url 'horizon:project:networks:create' %}{% endblock %}
diff --git a/openstack_dashboard/dashboards/project/networks/templates/networks/create.html b/openstack_dashboard/dashboards/project/networks/templates/networks/create.html
index 7a0c112428..d2d14ffeb3 100644
--- a/openstack_dashboard/dashboards/project/networks/templates/networks/create.html
+++ b/openstack_dashboard/dashboards/project/networks/templates/networks/create.html
@@ -1,6 +1,5 @@
 {% extends 'horizon/common/_workflow.html' %}
 {% load i18n %}
-{% load url from future %}
 
 {% block modal-footer %}
   {% if workflow.wizard %}
diff --git a/openstack_dashboard/dashboards/project/networks/templates/networks/ports/_detail_overview.html b/openstack_dashboard/dashboards/project/networks/templates/networks/ports/_detail_overview.html
index 5cba301b5b..4fa408ae1b 100644
--- a/openstack_dashboard/dashboards/project/networks/templates/networks/ports/_detail_overview.html
+++ b/openstack_dashboard/dashboards/project/networks/templates/networks/ports/_detail_overview.html
@@ -1,5 +1,4 @@
 {% load i18n sizeformat %}
-{% load url from future %}
 
 <div class="detail">
   <dl class="dl-horizontal">
diff --git a/openstack_dashboard/dashboards/project/networks/templates/networks/subnets/_detail_overview.html b/openstack_dashboard/dashboards/project/networks/templates/networks/subnets/_detail_overview.html
index 3f7ee20b02..36effbc5bc 100644
--- a/openstack_dashboard/dashboards/project/networks/templates/networks/subnets/_detail_overview.html
+++ b/openstack_dashboard/dashboards/project/networks/templates/networks/subnets/_detail_overview.html
@@ -1,5 +1,4 @@
 {% load i18n sizeformat %}
-{% load url from future %}
 
 <div class="detail">
   <dl class="dl-horizontal">
diff --git a/openstack_dashboard/dashboards/project/routers/templates/routers/extensions/routerroutes/_create.html b/openstack_dashboard/dashboards/project/routers/templates/routers/extensions/routerroutes/_create.html
index c7b2ecb899..ce096288b4 100644
--- a/openstack_dashboard/dashboards/project/routers/templates/routers/extensions/routerroutes/_create.html
+++ b/openstack_dashboard/dashboards/project/routers/templates/routers/extensions/routerroutes/_create.html
@@ -1,6 +1,5 @@
 {% extends "horizon/common/_modal_form.html" %}
 {% load i18n %}
-{% load url from future %}
 
 {% block form_id %}add_routerroute_form{% endblock %}
 {% block form_action %}{% url 'horizon:project:routers:addrouterroute' router.id %}
diff --git a/openstack_dashboard/dashboards/project/routers/templates/routers/extensions/routerrules/_create.html b/openstack_dashboard/dashboards/project/routers/templates/routers/extensions/routerrules/_create.html
index 13b21688b0..b512062f44 100644
--- a/openstack_dashboard/dashboards/project/routers/templates/routers/extensions/routerrules/_create.html
+++ b/openstack_dashboard/dashboards/project/routers/templates/routers/extensions/routerrules/_create.html
@@ -1,6 +1,5 @@
 {% extends "horizon/common/_modal_form.html" %}
 {% load i18n %}
-{% load url from future %}
 
 {% block form_id %}add_routerrule_form{% endblock %}
 {% block form_action %}{% url 'horizon:project:routers:addrouterrule' router.id %}
diff --git a/openstack_dashboard/dashboards/project/routers/templates/routers/ports/_create.html b/openstack_dashboard/dashboards/project/routers/templates/routers/ports/_create.html
index 99188875e2..da1387ea0d 100644
--- a/openstack_dashboard/dashboards/project/routers/templates/routers/ports/_create.html
+++ b/openstack_dashboard/dashboards/project/routers/templates/routers/ports/_create.html
@@ -1,6 +1,5 @@
 {% extends "horizon/common/_modal_form.html" %}
 {% load i18n %}
-{% load url from future %}
 
 {% block form_id %}add_interface_form{% endblock %}
 {% block form_action %}{% url form_url router.id %}
diff --git a/openstack_dashboard/dashboards/project/routers/templates/routers/ports/_setgateway.html b/openstack_dashboard/dashboards/project/routers/templates/routers/ports/_setgateway.html
index 40bfc65704..cb9d5c0733 100644
--- a/openstack_dashboard/dashboards/project/routers/templates/routers/ports/_setgateway.html
+++ b/openstack_dashboard/dashboards/project/routers/templates/routers/ports/_setgateway.html
@@ -1,6 +1,5 @@
 {% extends "horizon/common/_modal_form.html" %}
 {% load i18n %}
-{% load url from future %}
 
 {% block form_id %}setgateway_form{% endblock %}
 {% block form_action %}{% url 'horizon:project:routers:setgateway' router.id %}
diff --git a/openstack_dashboard/dashboards/project/stacks/templates/stacks/_preview_details.html b/openstack_dashboard/dashboards/project/stacks/templates/stacks/_preview_details.html
index fb73e4f6dd..c66116d393 100644
--- a/openstack_dashboard/dashboards/project/stacks/templates/stacks/_preview_details.html
+++ b/openstack_dashboard/dashboards/project/stacks/templates/stacks/_preview_details.html
@@ -1,6 +1,5 @@
 {% extends "horizon/common/_modal.html" %}
 {% load i18n %}
-{% load url from future %}
 
 {% block modal-header %}{% trans "Stack Preview" %}{% endblock %}
 
diff --git a/openstack_dashboard/dashboards/project/volumes/templates/volumes/backups/_detail_overview.html b/openstack_dashboard/dashboards/project/volumes/templates/volumes/backups/_detail_overview.html
index d3e81326d4..e4e950faac 100644
--- a/openstack_dashboard/dashboards/project/volumes/templates/volumes/backups/_detail_overview.html
+++ b/openstack_dashboard/dashboards/project/volumes/templates/volumes/backups/_detail_overview.html
@@ -1,5 +1,4 @@
 {% load i18n sizeformat parse_date %}
-{% load url from future %}
 
 <div class="detail">
   <dl class="dl-horizontal">
diff --git a/openstack_dashboard/dashboards/project/volumes/templates/volumes/snapshots/_detail_overview.html b/openstack_dashboard/dashboards/project/volumes/templates/volumes/snapshots/_detail_overview.html
index 4947705592..9d92515304 100644
--- a/openstack_dashboard/dashboards/project/volumes/templates/volumes/snapshots/_detail_overview.html
+++ b/openstack_dashboard/dashboards/project/volumes/templates/volumes/snapshots/_detail_overview.html
@@ -1,5 +1,4 @@
 {% load i18n sizeformat parse_date %}
-{% load url from future %}
 
 <div class="detail">
   <dl class="dl-horizontal">
diff --git a/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/_attach.html b/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/_attach.html
index 972ac3cb77..c985eca91a 100644
--- a/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/_attach.html
+++ b/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/_attach.html
@@ -1,6 +1,5 @@
 {% extends "horizon/common/_modal_form.html" %}
 {% load i18n %}
-{% load url from future %}
 
 {% block form_class %}{{ block.super }} horizontal {% if show_attach %}split_half{% else %} no_split{% endif %}{% endblock %}
 
diff --git a/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/_create_snapshot.html b/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/_create_snapshot.html
index 3852909868..97afbc27cc 100644
--- a/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/_create_snapshot.html
+++ b/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/_create_snapshot.html
@@ -1,6 +1,5 @@
 {% extends "horizon/common/_modal_form.html" %}
 {% load i18n %}
-{% load url from future %}
 
 {% block modal-body-right %}
   <div class="quota-dynamic">
diff --git a/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/_detail_overview.html b/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/_detail_overview.html
index bb7fd681ca..c0b658c4bb 100644
--- a/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/_detail_overview.html
+++ b/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/_detail_overview.html
@@ -1,5 +1,4 @@
 {% load i18n sizeformat parse_date %}
-{% load url from future %}
 
 <div class="detail">
   <dl class="dl-horizontal">
diff --git a/openstack_dashboard/dashboards/project/vpn/templates/vpn/_ipsecsiteconnection_details.html b/openstack_dashboard/dashboards/project/vpn/templates/vpn/_ipsecsiteconnection_details.html
index f83d908a1c..1a125525bf 100644
--- a/openstack_dashboard/dashboards/project/vpn/templates/vpn/_ipsecsiteconnection_details.html
+++ b/openstack_dashboard/dashboards/project/vpn/templates/vpn/_ipsecsiteconnection_details.html
@@ -1,5 +1,4 @@
 {% load i18n sizeformat parse_date %}
-{% load url from future %}
 
 <div class="detail">
   <dl class="dl-horizontal">
diff --git a/openstack_dashboard/dashboards/project/vpn/templates/vpn/_vpnservice_details.html b/openstack_dashboard/dashboards/project/vpn/templates/vpn/_vpnservice_details.html
index 26ba65cfa6..20866d2ba2 100644
--- a/openstack_dashboard/dashboards/project/vpn/templates/vpn/_vpnservice_details.html
+++ b/openstack_dashboard/dashboards/project/vpn/templates/vpn/_vpnservice_details.html
@@ -1,5 +1,4 @@
 {% load i18n sizeformat parse_date %}
-{% load url from future %}
 
 <div class="detail">
   <dl class="dl-horizontal">
diff --git a/openstack_dashboard/templates/403.html b/openstack_dashboard/templates/403.html
index 2e79212e15..88f3748fae 100644
--- a/openstack_dashboard/templates/403.html
+++ b/openstack_dashboard/templates/403.html
@@ -1,6 +1,5 @@
 {% extends "base.html" %}
 {% load i18n %}
-{% load url from future %}
 
 {% block title %} - {% trans "Forbidden" %}{% endblock %}
 
diff --git a/openstack_dashboard/templates/404.html b/openstack_dashboard/templates/404.html
index 12a052251b..93d33a7c3c 100644
--- a/openstack_dashboard/templates/404.html
+++ b/openstack_dashboard/templates/404.html
@@ -1,6 +1,5 @@
 {% extends "base.html" %}
 {% load i18n %}
-{% load url from future %}
 
 {% block title %} - {% trans "Page Not Found" %}{% endblock %}
 
diff --git a/openstack_dashboard/templates/_header.html b/openstack_dashboard/templates/_header.html
index d86ab81ebd..8d0a115800 100644
--- a/openstack_dashboard/templates/_header.html
+++ b/openstack_dashboard/templates/_header.html
@@ -1,5 +1,4 @@
 {% load branding i18n %}
-{% load url from future %}
 {% load context_selection %}
 
 <nav class="navbar navbar-default">
diff --git a/openstack_dashboard/templates/context_selection/_project_list.html b/openstack_dashboard/templates/context_selection/_project_list.html
index 3c8a17ae7d..1a7536e3c6 100644
--- a/openstack_dashboard/templates/context_selection/_project_list.html
+++ b/openstack_dashboard/templates/context_selection/_project_list.html
@@ -1,5 +1,4 @@
 {% load i18n %}
-{% load url from future %}
 
 {% with dashboard_url=request.horizon.dashboard.get_absolute_url %}
 <ul>
diff --git a/openstack_dashboard/templates/context_selection/_region_list.html b/openstack_dashboard/templates/context_selection/_region_list.html
index def7f22bfc..3610e22056 100644
--- a/openstack_dashboard/templates/context_selection/_region_list.html
+++ b/openstack_dashboard/templates/context_selection/_region_list.html
@@ -1,5 +1,4 @@
 {% load i18n %}
-{% load url from future %}
 
 {% with panel_url=request.horizon.panel.get_absolute_url %}
 <ul>
diff --git a/openstack_dashboard/templates/horizon/_script_i18n.html b/openstack_dashboard/templates/horizon/_script_i18n.html
index 8e9ed0e2c4..e9aa8f49f2 100644
--- a/openstack_dashboard/templates/horizon/_script_i18n.html
+++ b/openstack_dashboard/templates/horizon/_script_i18n.html
@@ -1,3 +1,2 @@
-{% load url from future %}
 {% comment %} Django's JavaScript i18n Implementation {% endcomment %}
 <script type="text/javascript" src="{% url 'horizon:jsi18n' 'horizon+openstack_dashboard' %}"></script>
diff --git a/openstack_dashboard/templates/horizon/_scripts.html b/openstack_dashboard/templates/horizon/_scripts.html
index 226a2fed33..24c9be02a5 100644
--- a/openstack_dashboard/templates/horizon/_scripts.html
+++ b/openstack_dashboard/templates/horizon/_scripts.html
@@ -1,6 +1,4 @@
 {% load compress %}
-{% load url from future %}
-{% load firstof from future %}
 {% load datepicker_locale from horizon %}
 
 {% datepicker_locale as DATEPICKER_LOCALE %}
diff --git a/openstack_dashboard/themes/material/templates/_header.html b/openstack_dashboard/themes/material/templates/_header.html
index 5b5fc7b6e3..1ea3a1f929 100644
--- a/openstack_dashboard/themes/material/templates/_header.html
+++ b/openstack_dashboard/themes/material/templates/_header.html
@@ -1,5 +1,4 @@
 {% load branding i18n %}
-{% load url from future %}
 {% load context_selection %}
 {% load compress %}
 
diff --git a/openstack_dashboard/themes/material/templates/horizon/_sidebar.html b/openstack_dashboard/themes/material/templates/horizon/_sidebar.html
index cd6502cdce..292ecd9f70 100644
--- a/openstack_dashboard/themes/material/templates/horizon/_sidebar.html
+++ b/openstack_dashboard/themes/material/templates/horizon/_sidebar.html
@@ -1,5 +1,4 @@
 {% load horizon i18n %}
-{% load url from future %}
 
 <div class="sidebar-wrapper">
   <ul id="sidebar-drawer" class="nav nav-pills nav-stacked">
diff --git a/tox.ini b/tox.ini
index 0c1c1ff64f..3d491cfd58 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py27dj17,py27dj18,pep8,py34,releasenotes
+envlist = py27,py27dj18,pep8,py34,releasenotes
 minversion = 1.6
 skipsdist = True
 
@@ -83,11 +83,6 @@ commands = {posargs}
 [testenv:cover]
 commands = /bin/bash run_tests.sh -N --no-pep8 --coverage {posargs}
 
-[testenv:py27dj17]
-basepython = python2.7
-commands = pip install django>=1.7,<1.8
-           /bin/bash run_tests.sh -N --no-pep8 {posargs}
-
 # Django-1.8 is LTS
 [testenv:py27dj18]
 basepython = python2.7