From 4123450e9f9bdd1ca965f224f4ce41716d10654f Mon Sep 17 00:00:00 2001
From: Valentin Samir <valentin.samir@crans.org>
Date: Sat, 27 Jan 2018 10:44:34 +0100
Subject: [PATCH] Add support for Django 2.0, fix #33

---
 CHANGELOG.rst       | 1 +
 cas_server/utils.py | 5 ++++-
 cas_server/views.py | 5 ++++-
 requirements.txt    | 2 +-
 setup.py            | 3 ++-
 tox.ini             | 7 +++++++
 6 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 9cf850b..01e598b 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -13,6 +13,7 @@ Unreleased
 Added
 -----
 * Support for python 3.6 and Django 1.11
+* Support for Django 2.0
 
 
 v0.9.0 - 2017-11-17
diff --git a/cas_server/utils.py b/cas_server/utils.py
index af1e81e..190c290 100644
--- a/cas_server/utils.py
+++ b/cas_server/utils.py
@@ -12,7 +12,6 @@
 """Some util function for the app"""
 from .default_settings import settings
 
-from django.core.urlresolvers import reverse
 from django.http import HttpResponseRedirect, HttpResponse
 from django.contrib import messages
 from django.contrib.messages import constants as DEFAULT_MESSAGE_LEVELS
@@ -20,6 +19,10 @@ from django.core.serializers.json import DjangoJSONEncoder
 from django.utils import timezone
 from django.core.exceptions import ValidationError
 from django.utils.translation import ugettext_lazy as _
+try:
+    from django.urls import reverse
+except ImportError:
+    from django.core.urlresolvers import reverse
 
 import re
 import random
diff --git a/cas_server/views.py b/cas_server/views.py
index 3db45c1..9bd7606 100644
--- a/cas_server/views.py
+++ b/cas_server/views.py
@@ -13,7 +13,6 @@
 from .default_settings import settings, SessionStore
 
 from django.shortcuts import render, redirect
-from django.core.urlresolvers import reverse
 from django.http import HttpResponse, HttpResponseRedirect
 from django.contrib import messages
 from django.utils.decorators import method_decorator
@@ -24,6 +23,10 @@ from django.middleware.csrf import CsrfViewMiddleware
 from django.views.generic import View
 from django.utils.encoding import python_2_unicode_compatible
 from django.utils.safestring import mark_safe
+try:
+    from django.urls import reverse
+except ImportError:
+    from django.core.urlresolvers import reverse
 
 import re
 import logging
diff --git a/requirements.txt b/requirements.txt
index 011a59e..be48d39 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-Django >= 1.7.1,<1.11
+Django >= 1.7.1,<2.1
 setuptools>=5.5
 requests>=2.4
 requests_futures>=0.9.5
diff --git a/setup.py b/setup.py
index 7fded3a..9ff6a33 100644
--- a/setup.py
+++ b/setup.py
@@ -36,6 +36,7 @@ if __name__ == '__main__':
             'Framework :: Django :: 1.9',
             'Framework :: Django :: 1.10',
             'Framework :: Django :: 1.11',
+            'Framework :: Django :: 2.0',
             'Intended Audience :: Developers',
             'Intended Audience :: System Administrators',
             'License :: OSI Approved :: GNU General Public License v3 (GPLv3)',
@@ -61,7 +62,7 @@ if __name__ == '__main__':
         },
         keywords=['django', 'cas', 'cas3', 'server', 'sso', 'single sign-on', 'authentication', 'auth'],
         install_requires=[
-            'Django >= 1.7,<1.12', 'requests >= 2.4', 'requests_futures >= 0.9.5',
+            'Django >= 1.7,<2.1', 'requests >= 2.4', 'requests_futures >= 0.9.5',
             'lxml >= 3.4', 'six >= 1'
         ],
         url="https://github.com/nitmir/django-cas-server",
diff --git a/tox.ini b/tox.ini
index d9161de..5d154d6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,6 +12,7 @@ envlist=
     py35-django110,
     py35-django111,
     py36-django111,
+    py36-django20,
 
 [flake8]
 max-line-length=100
@@ -97,6 +98,12 @@ deps =
     Django>=1.11,<1.12
     {[base]deps}
 
+[testenv:py36-django20]
+basepython=python3.6
+deps =
+    Django>=2.0,<2.1
+    {[base]deps}
+
 
 
 [testenv:flake8]