diff options
author | Marcello Stanisci <stanisci.m@gmail.com> | 2017-12-04 13:10:44 +0100 |
---|---|---|
committer | Marcello Stanisci <stanisci.m@gmail.com> | 2017-12-04 13:10:44 +0100 |
commit | 2cc5448e17d9137a45b924dcbce27264b7f8be4e (patch) | |
tree | 291c7fdd659c8f7046ba37387b81e8edd502c10e | |
parent | c8f9b7aa165b19c9b8c5bb61562d000ff5996311 (diff) | |
download | bank-2cc5448e17d9137a45b924dcbce27264b7f8be4e.tar.gz bank-2cc5448e17d9137a45b924dcbce27264b7f8be4e.tar.bz2 bank-2cc5448e17d9137a45b924dcbce27264b7f8be4e.zip |
port to django2
-rw-r--r-- | talerbank/app/tests.py | 2 | ||||
-rw-r--r-- | talerbank/app/views.py | 2 | ||||
-rw-r--r-- | talerbank/jinja2.py | 3 | ||||
-rw-r--r-- | talerbank/settings.py | 4 |
4 files changed, 5 insertions, 6 deletions
diff --git a/talerbank/app/tests.py b/talerbank/app/tests.py index 8baed5a..3d2dfe8 100644 --- a/talerbank/app/tests.py +++ b/talerbank/app/tests.py @@ -18,7 +18,7 @@ import json import timeit import logging from django.test import TestCase, Client -from django.core.urlresolvers import reverse +from django.urls import reverse from django.conf import settings from django.contrib.auth.models import User from mock import patch, MagicMock diff --git a/talerbank/app/views.py b/talerbank/app/views.py index f31f3e4..994ffc2 100644 --- a/talerbank/app/views.py +++ b/talerbank/app/views.py @@ -32,7 +32,7 @@ from django.conf import settings from django.contrib.auth.decorators import login_required from django.views.decorators.csrf import csrf_exempt from django.views.decorators.http import require_POST, require_GET -from django.core.urlresolvers import reverse +from django.urls import reverse from django.contrib.auth.models import User from django.db.models import Q from django.http import (JsonResponse, HttpResponse, diff --git a/talerbank/jinja2.py b/talerbank/jinja2.py index 9169a93..c6688c7 100644 --- a/talerbank/jinja2.py +++ b/talerbank/jinja2.py @@ -15,9 +15,8 @@ # @author Florian Dold from django.contrib.staticfiles.storage import staticfiles_storage -from django.core.urlresolvers import reverse +from django.urls import reverse, get_script_prefix from django.conf import settings -from django.core.urlresolvers import get_script_prefix from urllib.parse import urlparse from jinja2 import Environment import os diff --git a/talerbank/settings.py b/talerbank/settings.py index 19c4d8e..6380937 100644 --- a/talerbank/settings.py +++ b/talerbank/settings.py @@ -58,13 +58,13 @@ INSTALLED_APPS = [ 'talerbank.app' ] -MIDDLEWARE_CLASSES = [ +MIDDLEWARE = [ 'django.middleware.security.SecurityMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.auth.middleware.SessionAuthenticationMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', ] |