From 48b6ed5b69093e2ed43b69b91868af9e1fb02bf1 Mon Sep 17 00:00:00 2001
From: Aarni Halinen <aarni.halinen@aalto.fi>
Date: Wed, 9 May 2018 20:03:30 +0300
Subject: [PATCH] Update Django 2.0

---
 requirements.txt     | 8 ++++----
 sikweb/base.py       | 6 ++++--
 sikweb/middleware.py | 7 +++++--
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index abd8dff..b2152fa 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 backports.shutil-get-terminal-size==1.0.0
 decorator==4.0.9
-Django==1.11
+Django==2.0
 ipython==4.2.0
 ipython-genutils==0.1.0
 pexpect==4.1.0
@@ -13,7 +13,7 @@ Pillow==4.3.0
 requests==2.11.1
 django-nocaptcha-recaptcha==0.0.19
 django-cors-headers==2.0.1
-djangorestframework==3.5.3
+djangorestframework==3.8.2
 coverage==4.3.4
 django-nose==1.4.5
 nose-exclude==0.5.0
@@ -22,14 +22,14 @@ django-bootstrap3==8.2.3
 django-tables2==1.6.1
 pycodestyle==2.3.1
 dealer==2.0.5
-django-modeltranslation==0.12.1
+django-modeltranslation==0.13b1
 django-auditlog==0.4.5
 django-phonenumber-field==1.3.0
 django-autocomplete-light==3.2.10
 six==1.10.0
 django-suit==0.2.26
 telepot==12.3
-django-password-reset==1.0
+django-password-reset==1.0.1
 pyexcel==0.5.7
 pyexcel-xlsx==0.5.5
 django-import-export==0.7.0
diff --git a/sikweb/base.py b/sikweb/base.py
index 94ef3eb..b5422a7 100644
--- a/sikweb/base.py
+++ b/sikweb/base.py
@@ -118,7 +118,7 @@ NOSE_ARGS = [
     '--exclude-dir={}'.format(os.path.join(BASE_DIR, 'webapp', 'migrations')),
 ]
 
-MIDDLEWARE_CLASSES = [
+MIDDLEWARE = [
     'sikweb.middleware.ForceDefaultLanguageMiddleware',
     'django.middleware.security.SecurityMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
@@ -127,11 +127,13 @@ MIDDLEWARE_CLASSES = [
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
     'auditlog.middleware.AuditlogMiddleware'
 ]
+MIDDLEWARE_CLASSES = [
+    'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
+]
 CORS_ORIGIN_ALLOW_ALL = True
 
 ROOT_URLCONF = 'sikweb.urls'
diff --git a/sikweb/middleware.py b/sikweb/middleware.py
index 8ad8c13..11e924d 100644
--- a/sikweb/middleware.py
+++ b/sikweb/middleware.py
@@ -1,4 +1,4 @@
-class ForceDefaultLanguageMiddleware(object):
+def ForceDefaultLanguageMiddleware(get_response):
     """
     Ignore Accept-Language HTTP headers
 
@@ -8,6 +8,9 @@ class ForceDefaultLanguageMiddleware(object):
     Should be installed *before* any middleware that checks request.META['HTTP_ACCEPT_LANGUAGE'],
     namely django.middleware.locale.LocaleMiddleware
     """
-    def process_request(self, request):
+    def process_request(request):
         if 'HTTP_ACCEPT_LANGUAGE' in request.META:
             del request.META['HTTP_ACCEPT_LANGUAGE']
+        return get_response(request)
+
+    return process_request