Merge branch 'fix/django1.9/url-tags' of https://github.com/AlexanderS/bcfg2

16 files changed, 39 insertions, 61 deletions

diff --git a/debian/control b/debian/control
index f131bbe05..8d642037a 100644
--- a/debian/control
+++ b/debian/control
@@ -35,7 +35,7 @@ Package: bcfg2-server
 Architecture: all
 Depends: ${python:Depends}, ${misc:Depends}, python-lxml (>= 0.9), libxml2-utils (>= 2.6.23), lsb-base (>= 3.1-9), ucf, bcfg2 (= ${binary:Version}), openssl, python (>= 2.6), python-pyinotify | python-gamin, python-daemon, python-genshi (>= 0.4.4)
 Recommends: graphviz, patch
-Suggests: python-cheetah, python-profiler, python-django, mail-transport-agent, bcfg2-doc (= ${binary:Version})
+Suggests: python-cheetah, python-profiler, python-django (>= 1.3), mail-transport-agent, bcfg2-doc (= ${binary:Version})
 Description: Configuration management server
  Bcfg2 is a configuration management system that generates configuration sets
  for clients bound by client profiles.
@@ -44,7 +44,7 @@ Description: Configuration management server
 
 Package: bcfg2-web
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, bcfg2-server (= ${binary:Version}), python-django, python-django-south (>= 0.7.5)
+Depends: ${python:Depends}, ${misc:Depends}, bcfg2-server (= ${binary:Version}), python-django (>= 1.3), python-django-south (>= 0.7.5)
 Suggests: python-mysqldb, python-psycopg2, python-sqlite, libapache2-mod-wsgi
 Description: Configuration management web interface
  Bcfg2 is a configuration management system that generates configuration sets
diff --git a/doc/installation/prerequisites.txt b/doc/installation/prerequisites.txt
index d89d44894..d45599955 100644
--- a/doc/installation/prerequisites.txt
+++ b/doc/installation/prerequisites.txt
@@ -72,7 +72,7 @@ reporting, such as Apache + mod_wsgi or nginx.
 +-------------------------------+----------+--------------------------------+
 | Software                      | Version  | Requires                       |
 +===============================+==========+================================+
-| django                        | 1.2.0+   |                                |
+| django                        | 1.3.0+   |                                |
 +-------------------------------+----------+--------------------------------+
 | south                         | 0.7.5+   |                                |
 +-------------------------------+----------+--------------------------------+
diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec
index 5db928c3d..91260c317 100644
--- a/misc/bcfg2.spec
+++ b/misc/bcfg2.spec
@@ -85,9 +85,9 @@ BuildRequires:    mock
 BuildRequires:    m2crypto
 # EPEL uses the properly-named python-django starting with EPEL7
 %if 0%{?rhel} && 0%{?rhel} > 6
-BuildRequires:    python-django
+BuildRequires:    python-django >= 1.3
 %else
-BuildRequires:    Django
+BuildRequires:    Django >= 1.3
 %endif
 BuildRequires:    python-genshi
 BuildRequires:    python-cheetah
@@ -303,15 +303,15 @@ Requires:         bcfg2-server = %{version}-%{release}
 Requires:         httpd
 %if 0%{?suse_version}
 Group:            System/Management
-Requires:         python-django >= 1.2
+Requires:         python-django >= 1.3
 Requires:         python-django-south >= 0.7
 %else
 Group:            System Tools
 # EPEL uses the properly-named python-django starting with EPEL7
 %if 0%{?rhel} && 0%{?rhel} > 6
-Requires:         python-django
+Requires:         python-django > 1.3
 %else
-Requires:         Django >= 1.2
+Requires:         Django >= 1.3
 Requires:         Django-south >= 0.7
 %endif
 Requires:         bcfg2-server
diff --git a/src/lib/Bcfg2/DBSettings.py b/src/lib/Bcfg2/DBSettings.py
index 3b5cbbbd8..6409f8b37 100644
--- a/src/lib/Bcfg2/DBSettings.py
+++ b/src/lib/Bcfg2/DBSettings.py
@@ -65,7 +65,12 @@ settings = dict(  # pylint: disable=C0103
         'django.core.context_processors.media',
         'django.core.context_processors.request'),
     DATABASE_ROUTERS=['Bcfg2.DBSettings.PerApplicationRouter'],
-    TEST_RUNNER='django.test.simple.DjangoTestSuiteRunner')
+    TEST_RUNNER='django.test.simple.DjangoTestSuiteRunner',
+    CACHES={
+        'default': {
+            'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
+        }
+    })
 
 if HAS_DJANGO and django.VERSION[0] == 1 and django.VERSION[1] >= 6:
     settings['MIDDLEWARE_CLASSES'] += \
@@ -85,15 +90,6 @@ elif HAS_SOUTH:
 if 'BCFG2_LEGACY_MODELS' in os.environ:
     settings['INSTALLED_APPS'] += ('Bcfg2.Server.Reports.reports',)
 
-if HAS_DJANGO and django.VERSION[0] == 1 and django.VERSION[1] < 3:
-    settings['CACHE_BACKEND'] = 'locmem:///'
-else:
-    settings['CACHES'] = {
-        'default': {
-            'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
-        }
-    }
-
 
 def finalize_django_config(opts=None, silent=False):
     """ Perform final Django configuration """
diff --git a/src/lib/Bcfg2/Reporting/templates/base.html b/src/lib/Bcfg2/Reporting/templates/base.html
index f6ecfd263..2e9ec888a 100644
--- a/src/lib/Bcfg2/Reporting/templates/base.html
+++ b/src/lib/Bcfg2/Reporting/templates/base.html
@@ -1,9 +1,5 @@
 {% load bcfg2_tags %}
-{% comment %}
-This is needed for Django versions less than 1.5
-{% endcomment %}
-{% load url from future %}
-
+{% load url from bcfg2_compat %}
 <?xml version="1.0"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
diff --git a/src/lib/Bcfg2/Reporting/templates/clients/detail.html b/src/lib/Bcfg2/Reporting/templates/clients/detail.html
index 6809dcc2d..4258fc11d 100644
--- a/src/lib/Bcfg2/Reporting/templates/clients/detail.html
+++ b/src/lib/Bcfg2/Reporting/templates/clients/detail.html
@@ -1,9 +1,6 @@
 {% extends "base.html" %}
 {% load bcfg2_tags %}
-{% comment %}
-This is needed for Django versions less than 1.5
-{% endcomment %}
-{% load url from future %}
+{% load url from bcfg2_compat %}
 
 {% block title %}Bcfg2 - Client {{client.name}}{% endblock %}
 
diff --git a/src/lib/Bcfg2/Reporting/templates/clients/detailed-list.html b/src/lib/Bcfg2/Reporting/templates/clients/detailed-list.html
index 130d58ede..56594554c 100644
--- a/src/lib/Bcfg2/Reporting/templates/clients/detailed-list.html
+++ b/src/lib/Bcfg2/Reporting/templates/clients/detailed-list.html
@@ -1,9 +1,6 @@
 {% extends "base-timeview.html" %}
 {% load bcfg2_tags %}
-{% comment %}
-This is needed for Django versions less than 1.5
-{% endcomment %}
-{% load url from future %}
+{% load url from bcfg2_compat %}
 
 {% block title %}Bcfg2 - Detailed Client Listing{% endblock %}
 {% block pagebanner %}Clients - Detailed View{% endblock %}
diff --git a/src/lib/Bcfg2/Reporting/templates/clients/index.html b/src/lib/Bcfg2/Reporting/templates/clients/index.html
index eba83670b..1eaa3ca9b 100644
--- a/src/lib/Bcfg2/Reporting/templates/clients/index.html
+++ b/src/lib/Bcfg2/Reporting/templates/clients/index.html
@@ -1,9 +1,6 @@
 {% extends "base-timeview.html" %}
 {% load bcfg2_tags %}
-{% comment %}
-This is needed for Django versions less than 1.5
-{% endcomment %}
-{% load url from future %}
+{% load url from bcfg2_compat %}
 
 {% block extra_header_info %}
 {% endblock%}
diff --git a/src/lib/Bcfg2/Reporting/templates/clients/manage.html b/src/lib/Bcfg2/Reporting/templates/clients/manage.html
index 03918aad7..2379cfe6a 100644
--- a/src/lib/Bcfg2/Reporting/templates/clients/manage.html
+++ b/src/lib/Bcfg2/Reporting/templates/clients/manage.html
@@ -1,8 +1,5 @@
 {% extends "base.html" %}
-{% comment %}
-This is needed for Django versions less than 1.5
-{% endcomment %}
-{% load url from future %}
+{% load url from bcfg2_compat %}
 
 {% block extra_header_info %}
 {% endblock%}
diff --git a/src/lib/Bcfg2/Reporting/templates/config_items/common.html b/src/lib/Bcfg2/Reporting/templates/config_items/common.html
index 91f37d7dc..1445182be 100644
--- a/src/lib/Bcfg2/Reporting/templates/config_items/common.html
+++ b/src/lib/Bcfg2/Reporting/templates/config_items/common.html
@@ -1,6 +1,6 @@
 {% extends "base-timeview.html" %}
 {% load bcfg2_tags %}
-{% load url from future %}
+{% load url from bcfg2_compat %}
 
 {% block title %}Bcfg2 - Common Problems{% endblock %}
 
diff --git a/src/lib/Bcfg2/Reporting/templates/config_items/entry_status.html b/src/lib/Bcfg2/Reporting/templates/config_items/entry_status.html
index 8a5d93690..160d9c738 100644
--- a/src/lib/Bcfg2/Reporting/templates/config_items/entry_status.html
+++ b/src/lib/Bcfg2/Reporting/templates/config_items/entry_status.html
@@ -1,9 +1,6 @@
 {% extends "base-timeview.html" %}
 {% load bcfg2_tags %}
-{% comment %}
-This is needed for Django versions less than 1.5
-{% endcomment %}
-{% load url from future %}
+{% load url from bcfg2_compat %}
 
 {% block title %}Bcfg2 - Entry Status{% endblock %}
 
diff --git a/src/lib/Bcfg2/Reporting/templates/config_items/item.html b/src/lib/Bcfg2/Reporting/templates/config_items/item.html
index 2e2fd36fa..91c368bd7 100644
--- a/src/lib/Bcfg2/Reporting/templates/config_items/item.html
+++ b/src/lib/Bcfg2/Reporting/templates/config_items/item.html
@@ -1,11 +1,7 @@
 {% extends "base.html" %}
 {% load split %}
 {% load syntax_coloring %}
-{% comment %}
-This is needed for Django versions less than 1.5
-{% endcomment %}
-{% load url from future %}
-
+{% load url from bcfg2_compat %}
 
 {% block title %}Bcfg2 - Element Details{% endblock %}
 
diff --git a/src/lib/Bcfg2/Reporting/templates/config_items/listing.html b/src/lib/Bcfg2/Reporting/templates/config_items/listing.html
index 0e4812e85..1ae82dab5 100644
--- a/src/lib/Bcfg2/Reporting/templates/config_items/listing.html
+++ b/src/lib/Bcfg2/Reporting/templates/config_items/listing.html
@@ -1,9 +1,6 @@
 {% extends "base-timeview.html" %}
 {% load bcfg2_tags %}
-{% comment %}
-This is needed for Django versions less than 1.5
-{% endcomment %}
-{% load url from future %}
+{% load url from bcfg2_compat %}
 
 {% block title %}Bcfg2 - Element Listing{% endblock %}
 
diff --git a/src/lib/Bcfg2/Reporting/templates/displays/summary.html b/src/lib/Bcfg2/Reporting/templates/displays/summary.html
index ffafd52e0..53f504c15 100644
--- a/src/lib/Bcfg2/Reporting/templates/displays/summary.html
+++ b/src/lib/Bcfg2/Reporting/templates/displays/summary.html
@@ -1,9 +1,6 @@
 {% extends "base-timeview.html" %}
 {% load bcfg2_tags %}
-{% comment %}
-This is needed for Django versions less than 1.5
-{% endcomment %}
-{% load url from future %}
+{% load url from bcfg2_compat %}
 
 {% block title %}Bcfg2 - Client Summary{% endblock %}
 {% block pagebanner %}Clients - Summary{% endblock %}
diff --git a/src/lib/Bcfg2/Reporting/templates/displays/timing.html b/src/lib/Bcfg2/Reporting/templates/displays/timing.html
index 8ac5e49bb..2d24fc1c2 100644
--- a/src/lib/Bcfg2/Reporting/templates/displays/timing.html
+++ b/src/lib/Bcfg2/Reporting/templates/displays/timing.html
@@ -1,9 +1,6 @@
 {% extends "base-timeview.html" %}
 {% load bcfg2_tags %}
-{% comment %}
-This is needed for Django versions less than 1.5
-{% endcomment %}
-{% load url from future %}
+{% load url from bcfg2_compat %}
 
 {% block title %}Bcfg2 - Performance Metrics{% endblock %}
 {% block pagebanner %}Performance Metrics{% endblock %}
diff --git a/src/lib/Bcfg2/Reporting/templatetags/bcfg2_compat.py b/src/lib/Bcfg2/Reporting/templatetags/bcfg2_compat.py
new file mode 100644
index 000000000..da4c73745
--- /dev/null
+++ b/src/lib/Bcfg2/Reporting/templatetags/bcfg2_compat.py
@@ -0,0 +1,14 @@
+from django.template import Library
+
+try:
+    from django.templatetags.future import url as django_url
+except ImportError:
+    # future is removed in django 1.9
+    from django.template.defaulttags import url as django_url
+
+register = Library()
+
+
+@register.tag
+def url(parser, token):
+    return django_url(parser, token)