From 4e5a3b8218a0a3234e820ad60486f4b3a4280326 Mon Sep 17 00:00:00 2001
From: Artur Basiak <artur.basiak@ts.fujitsu.com>
Date: Tue, 6 Jun 2017 08:46:01 +0200
Subject: [PATCH] Remove 'load url from future'

Use staticfiles template tag instead of the obsolete
'load url from future'. Also fix unit tests.

Change-Id: Ifc36d5ca69db298bb74e2519731cd1a138bdc391
Story: 2001059
Task: 4663
---
 monitoring/alarmdefs/templates/alarmdefs/_edit.html           | 1 -
 monitoring/alarmdefs/templates/alarmdefs/alarm.html           | 1 -
 .../alarmdefs/templates/alarmdefs/notification_field.html     | 1 -
 monitoring/alarms/templates/alarms/_filter.html               | 1 -
 monitoring/alarms/templates/alarms/alarm.html                 | 1 -
 monitoring/alarms/templates/alarms/alarm_history.html         | 1 -
 monitoring/alarms/templates/alarms/alarm_meter.html           | 1 -
 monitoring/notifications/templates/notifications/_create.html | 1 -
 monitoring/notifications/templates/notifications/_detail.html | 1 -
 monitoring/notifications/templates/notifications/_edit.html   | 1 -
 monitoring/notifications/templates/notifications/index.html   | 1 -
 monitoring/overview/templates/overview/index.html             | 1 -
 monitoring/test/helpers.py                                    | 2 +-
 monitoring/test/settings.py                                   | 4 ++--
 14 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/monitoring/alarmdefs/templates/alarmdefs/_edit.html b/monitoring/alarmdefs/templates/alarmdefs/_edit.html
index bb9d7e73..9c260e34 100644
--- a/monitoring/alarmdefs/templates/alarmdefs/_edit.html
+++ b/monitoring/alarmdefs/templates/alarmdefs/_edit.html
@@ -1,6 +1,5 @@
 {% extends "horizon/common/_modal_form.html" %}
 {% load i18n %}
-{% load url from future %}
 
 {% block form_id %}edit_alarm_form{% endblock %}
 {% block form_action %}{{ action_url }}{% endblock %}
diff --git a/monitoring/alarmdefs/templates/alarmdefs/alarm.html b/monitoring/alarmdefs/templates/alarmdefs/alarm.html
index 60533f1e..eee06074 100644
--- a/monitoring/alarmdefs/templates/alarmdefs/alarm.html
+++ b/monitoring/alarmdefs/templates/alarmdefs/alarm.html
@@ -1,7 +1,6 @@
 {% extends 'base.html' %}
 
 {% load i18n %}
-{% load url from future %}
 {% load compress %}
 
 {% block title %}{% trans 'Alarm Definitions' %}{% endblock %}
diff --git a/monitoring/alarmdefs/templates/alarmdefs/notification_field.html b/monitoring/alarmdefs/templates/alarmdefs/notification_field.html
index 9132732d..35e17216 100644
--- a/monitoring/alarmdefs/templates/alarmdefs/notification_field.html
+++ b/monitoring/alarmdefs/templates/alarmdefs/notification_field.html
@@ -1,5 +1,4 @@
 {% load i18n %}
-{% load url from future %}
 <div ng-controller="alarmNotificationFieldController as ctrl" ng-init="ctrl.init('{{ data }}')">
 
     <div ng-if="ctrl.empty">
diff --git a/monitoring/alarms/templates/alarms/_filter.html b/monitoring/alarms/templates/alarms/_filter.html
index 4a733cac..c35c48c6 100644
--- a/monitoring/alarms/templates/alarms/_filter.html
+++ b/monitoring/alarms/templates/alarms/_filter.html
@@ -1,6 +1,5 @@
 {% extends "horizon/common/_modal_form.html" %}
 {% load i18n %}
-{% load url from future %}
 
 
 {% block modal-body %}
diff --git a/monitoring/alarms/templates/alarms/alarm.html b/monitoring/alarms/templates/alarms/alarm.html
index 2f03f002..abd2c6ed 100644
--- a/monitoring/alarms/templates/alarms/alarm.html
+++ b/monitoring/alarms/templates/alarms/alarm.html
@@ -1,6 +1,5 @@
 {% extends 'base.html' %}
 {% load i18n %}
-{% load url from future %}
 
 {% block title %}{% trans 'Alarms' %}{% endblock %}
 
diff --git a/monitoring/alarms/templates/alarms/alarm_history.html b/monitoring/alarms/templates/alarms/alarm_history.html
index 76865397..66ba819a 100644
--- a/monitoring/alarms/templates/alarms/alarm_history.html
+++ b/monitoring/alarms/templates/alarms/alarm_history.html
@@ -1,6 +1,5 @@
 {% extends 'base.html' %}
 {% load i18n %}
-{% load url from future %}
 
 {% block title %}{% trans 'Alarm History' %}{% endblock %}
 
diff --git a/monitoring/alarms/templates/alarms/alarm_meter.html b/monitoring/alarms/templates/alarms/alarm_meter.html
index 27beb3c3..7a24e96f 100644
--- a/monitoring/alarms/templates/alarms/alarm_meter.html
+++ b/monitoring/alarms/templates/alarms/alarm_meter.html
@@ -1,6 +1,5 @@
 {% extends 'base.html' %}
 {% load i18n %}
-{% load url from future %}
 
 {% block title %}{% trans 'Measurements for Alarms' %}{% endblock %}
 
diff --git a/monitoring/notifications/templates/notifications/_create.html b/monitoring/notifications/templates/notifications/_create.html
index 1bd04c53..4f167be9 100644
--- a/monitoring/notifications/templates/notifications/_create.html
+++ b/monitoring/notifications/templates/notifications/_create.html
@@ -1,6 +1,5 @@
 {% extends "horizon/common/_modal_form.html" %}
 {% load i18n %}
-{% load url from future %}
 
 {% block form_id %}create_notif_method_form{% endblock %}
 {% block form_action %}{{ action_url }}{% endblock %}
diff --git a/monitoring/notifications/templates/notifications/_detail.html b/monitoring/notifications/templates/notifications/_detail.html
index 39b3f6c4..c7063188 100644
--- a/monitoring/notifications/templates/notifications/_detail.html
+++ b/monitoring/notifications/templates/notifications/_detail.html
@@ -1,6 +1,5 @@
 {% extends "horizon/common/_modal_form.html" %}
 {% load i18n %}
-{% load url from future %}
 
 {% block form_id %}detail_notif_method_form{% endblock %}
 {% block form_action %}{% url 'horizon:project:monitoring_notifications:methods:detail' notification_method.id %}{% endblock %}
diff --git a/monitoring/notifications/templates/notifications/_edit.html b/monitoring/notifications/templates/notifications/_edit.html
index a9ec56c4..896e134a 100644
--- a/monitoring/notifications/templates/notifications/_edit.html
+++ b/monitoring/notifications/templates/notifications/_edit.html
@@ -1,6 +1,5 @@
 {% extends "horizon/common/_modal_form.html" %}
 {% load i18n %}
-{% load url from future %}
 
 {% block form_id %}edit_method_form{% endblock %}
 {% block form_action %}{{ action_url }}{% endblock %}
diff --git a/monitoring/notifications/templates/notifications/index.html b/monitoring/notifications/templates/notifications/index.html
index 91469c3c..7e7ea647 100644
--- a/monitoring/notifications/templates/notifications/index.html
+++ b/monitoring/notifications/templates/notifications/index.html
@@ -5,7 +5,6 @@
 {% block page_header %}
   {% include 'horizon/common/_page_header.html' with title=_("Notifications") %}
 {% endblock page_header %}
-{% load url from future %}
 {% block main %}
     {{ table.render }}
 <div class="pagination">
diff --git a/monitoring/overview/templates/overview/index.html b/monitoring/overview/templates/overview/index.html
index 6013adf0..2e16bfff 100644
--- a/monitoring/overview/templates/overview/index.html
+++ b/monitoring/overview/templates/overview/index.html
@@ -5,7 +5,6 @@
 {% block page_header %}
   {% include 'horizon/common/_page_header.html' with title=_("Monitoring") %}
 {% endblock page_header %}
-{% load url from future %}
 {% block main %}
     <div style="padding: 3px;">
       {% if grafana_url %}
diff --git a/monitoring/test/helpers.py b/monitoring/test/helpers.py
index 326b84b8..f9615103 100644
--- a/monitoring/test/helpers.py
+++ b/monitoring/test/helpers.py
@@ -12,10 +12,10 @@
 #    under the License.
 
 import os
+import unittest
 import warnings
 
 from django.core.handlers import wsgi
-from django.utils import unittest
 
 from monitoring.test.test_data import utils as test_data_utils
 from openstack_dashboard.test import helpers as openstack_dashboard_helpers
diff --git a/monitoring/test/settings.py b/monitoring/test/settings.py
index cf57f57d..3067f0b1 100644
--- a/monitoring/test/settings.py
+++ b/monitoring/test/settings.py
@@ -26,9 +26,9 @@ TEMPLATE_DIRS = (
     os.path.join(TEST_DIR, 'templates'),
 )
 
-TEMPLATE_CONTEXT_PROCESSORS = global_settings.TEMPLATE_CONTEXT_PROCESSORS + (
+TEMPLATE_CONTEXT_PROCESSORS = global_settings.TEMPLATE_CONTEXT_PROCESSORS + [
     'openstack_dashboard.context_processors.openstack',
-)
+]
 
 INSTALLED_APPS = (
     'django.contrib.contenttypes',