From 3f0f0be180c59f0060e1e000119ae8bf0943c838 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Wed, 2 Mar 2016 18:14:46 +0100 Subject: [PATCH] silence Django 1.10 deprecration warnings --- mellon/urls.py | 20 +++++++++++++------- testsettings.py | 8 ++++++++ 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/mellon/urls.py b/mellon/urls.py index 15bf236..0d93c9b 100644 --- a/mellon/urls.py +++ b/mellon/urls.py @@ -1,11 +1,17 @@ from django.conf.urls import patterns, url +import django from . import views -urlpatterns = patterns('', - url('login/$', views.login, - name='mellon_login'), - url('logout/$', views.logout, - name='mellon_logout'), - url('metadata/$', views.metadata, - name='mellon_metadata')) + + +urlpatterns = [ + url('login/$', views.login, + name='mellon_login'), + url('logout/$', views.logout, + name='mellon_logout'), + url('metadata/$', views.metadata, + name='mellon_metadata') +] +if django.VERSION < (1,9): + urlpatterns = patterns('', *urlpatterns) diff --git a/testsettings.py b/testsettings.py index bef6499..d3cf99e 100644 --- a/testsettings.py +++ b/testsettings.py @@ -1,4 +1,5 @@ import os +import django from django.conf import global_settings DATABASES = { @@ -23,3 +24,10 @@ AUTHENTICATION_BACKENDS = ( 'mellon.backends.SAMLBackend', ) ROOT_URLCONF = 'mellon.urls' +if django.VERSION >= (1,8): + TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'APP_DIRS': True, + }, + ]