From b034744725b0d8f9e6235b04076ea28d52cc05b1 Mon Sep 17 00:00:00 2001
From: Paul Wagener <mail@paulwagener.nl>
Date: Wed, 20 Jul 2016 13:13:52 +0200
Subject: [PATCH] Upgrade Django

---
 securityquiz/settings.py | 28 ++++++++++++++++------------
 securityquiz/urls.py     | 28 ++++++++++++++--------------
 2 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/securityquiz/settings.py b/securityquiz/settings.py
index e33f548..76d63eb 100644
--- a/securityquiz/settings.py
+++ b/securityquiz/settings.py
@@ -23,11 +23,8 @@ SECRET_KEY = secrets.SECRET_KEY
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = False
 
-TEMPLATE_DEBUG = False
-
 if 'runserver' in sys.argv:
     DEBUG = True
-    TEMPLATE_DEBUG = True
 
 ALLOWED_HOSTS = ['sec1.aii.avans.nl']
 
@@ -98,10 +95,22 @@ STATIC_URL = '/static/'
 PROJECT_PATH = os.path.realpath(os.path.dirname(__file__)) + '/..'
 MEDIA_ROOT = PROJECT_PATH + '/media/'
 
-# Additional locations of static files
-TEMPLATE_DIRS = (
-    PROJECT_PATH + '/templates',
-)
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'DIRS': [],
+        'APP_DIRS': True,
+        'OPTIONS': {
+            'context_processors': [
+                'django.template.context_processors.debug',
+                'django.template.context_processors.request',
+                'django.contrib.auth.context_processors.auth',
+                'securityquiz.settings.closed',
+                'django.contrib.messages.context_processors.messages',
+            ],
+        },
+    },
+]
 
 STATICFILES_DIRS = (
     PROJECT_PATH + '/static',
@@ -109,8 +118,3 @@ STATICFILES_DIRS = (
 
 def closed(request):
     return {'CLOSED': CLOSED}
-
-TEMPLATE_CONTEXT_PROCESSORS = (
-    'django.contrib.auth.context_processors.auth',
-    'securityquiz.settings.closed'
-)
diff --git a/securityquiz/urls.py b/securityquiz/urls.py
index 500d194..e8cf829 100644
--- a/securityquiz/urls.py
+++ b/securityquiz/urls.py
@@ -1,21 +1,21 @@
 from django.conf.urls import patterns, include, url
 from django.contrib import admin
-admin.autodiscover()
+import views
 
-from views import SecurityApi
+admin.autodiscover()
 
-urlpatterns = patterns('',
+urlpatterns = [
     # Examples:
     url(r'^o/', include('oauth2_provider.urls', namespace='oauth2_provider')),
-    url(r'^api/hello', SecurityApi.as_view()),
-    url(r'^callback$', 'views.avans_callback'),
-    url(r'^logout$', 'views.avans_logout'),
-    url(r'^pull$', 'views.git_pull'),
+    url(r'^api/hello', views.SecurityApi.as_view()),
+    url(r'^callback$', views.avans_callback),
+    url(r'^logout$', views.avans_logout),
+    url(r'^pull$', views.git_pull),
     url(r'^admin/', include(admin.site.urls)),
-    url(r'^save$', 'views.save'),
-    url(r'^sign$', 'views.sign'),
-    url(r'^graderhelper$', 'views.graderhelper'),
-    url(r'^letsencrypt$', 'views.letsencrypt'),
-    url(r'^\.well-known/acme-challenge/(.+)', 'views.letsencrypt_challenge'),
-    url(r'^(.*)$', 'views.home', name='home'),
-)
+    url(r'^save$', views.save),
+    url(r'^sign$', views.sign),
+    url(r'^graderhelper$', views.graderhelper),
+    url(r'^letsencrypt$', views.letsencrypt),
+    url(r'^\.well-known/acme-challenge/(.+)', views.letsencrypt_challenge),
+    url(r'^(.*)$', views.home, name='home'),
+]