Additional changes for Django 1.9

jazzband · Dec 8, 2015 · f4b0328 · f4b0328
1 parent 94cb895
commit f4b0328
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 17 deletions.
diff --git a/example/settings.py b/example/settings.py
@@ -1,7 +1,6 @@
 import os
 
 DEBUG = True
-TEMPLATE_DEBUG = True
 
 PROJECT_PATH = os.path.dirname(__file__)
 
@@ -31,9 +30,27 @@
 
 ROOT_URLCONF = 'example.urls'
 
-TEMPLATE_DIRS = (
-    os.path.join(PROJECT_PATH, 'templates'),
-)
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'DIRS': [
+            os.path.join(PROJECT_PATH, 'templates'),
+        ],
+        'APP_DIRS': True,
+        'OPTIONS': {
+            'context_processors': [
+                'django.contrib.auth.context_processors.auth',
+                'django.template.context_processors.debug',
+                'django.template.context_processors.i18n',
+                'django.template.context_processors.media',
+                'django.template.context_processors.static',
+                'django.template.context_processors.tz',
+                'django.contrib.messages.context_processors.messages',
+            ],
+            'debug': True,
+        },
+    },
+]
 
 INSTALLED_APPS = (
     'django.contrib.admin',

diff --git a/example/urls.py b/example/urls.py
@@ -1,13 +1,12 @@
-from django.conf.urls import patterns, include, url
+from django.conf.urls import include, url
 
 from django.contrib import admin
 from django.core.urlresolvers import reverse_lazy
 from django.views.generic.base import RedirectView
 
 admin.autodiscover()
 
-urlpatterns = patterns(
-    '',
+urlpatterns = [
     url(
         regex=r'^$',
         view=RedirectView.as_view(
@@ -18,4 +17,4 @@
     ),
     url(r'', include('user_sessions.urls', 'user_sessions')),
     url(r'^admin/', include(admin.site.urls)),
-)
+]
diff --git a/tests/settings.py b/tests/settings.py
@@ -33,6 +33,27 @@
     }
 }
 
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'DIRS': [
+            os.path.join(BASE_DIR, 'templates'),
+        ],
+        'APP_DIRS': True,
+        'OPTIONS': {
+            'context_processors': [
+                'django.contrib.auth.context_processors.auth',
+                'django.template.context_processors.debug',
+                'django.template.context_processors.i18n',
+                'django.template.context_processors.media',
+                'django.template.context_processors.static',
+                'django.template.context_processors.tz',
+                'django.contrib.messages.context_processors.messages',
+            ],
+        },
+    },
+]
+
 GEOIP_PATH = os.path.join(os.path.dirname(BASE_DIR),
                           'example', 'GeoLiteCity.dat')
 SESSION_ENGINE = 'user_sessions.backends.db'
diff --git a/tests/urls.py b/tests/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls import patterns, url, include
+from django.conf.urls import url, include
 from django.contrib import admin
 from django.http import HttpResponse
 
@@ -15,10 +15,9 @@ def modify_session(request):
     return HttpResponse('')
 
 
-urlpatterns = patterns(
-    '',
+urlpatterns = [
     url(r'^$', empty),
     url(r'^modify_session/$', modify_session),
     url(r'^admin/', include(admin.site.urls)),
     url(r'', include('user_sessions.urls', 'user_sessions')),
-)
+]
diff --git a/user_sessions/urls.py b/user_sessions/urls.py
@@ -1,12 +1,10 @@
-from django.conf.urls import patterns, url
+from django.conf.urls import url
 from user_sessions.views import SessionDeleteOtherView
 
 from .views import SessionListView, SessionDeleteView
 
 
-urlpatterns = patterns(
-    '',
-
+urlpatterns = [
     url(
         regex=r'^account/sessions/$',
         view=SessionListView.as_view(),
@@ -22,4 +20,4 @@
         view=SessionDeleteView.as_view(),
         name='session_delete',
     ),
-)
+]