Merge branch 'develop'

Author: keithbauer

CHANGELOG.md

@@ -1,3 +1,6 @@
+### 1.4.0
+- Compatibility with Django 2.0 (https://github.com/kstateome/django-cas/pull/72)
+
 ### 1.3.0
 - Compatibility with Django 1.10 Middleware (https://github.com/kstateome/django-cas/pull/69)
 - Add support for protocol-rooted URL as "next_page" argument for _logout_url constructor (https://github.com/kstateome/django-cas/pull/67)

CONTRIBUTORS

@@ -4,3 +4,4 @@ bryankaplan
 cordmata
 bltravis
 JordanReiter
+balsdorf

README.md

@@ -2,7 +2,7 @@
 
 CAS client for Django.  This library requires Django 1.5 or above, and Python 2.6, 2.7, 3.4
 
-Current version: 1.3.0
+Current version: 1.4.0
 
 This is [K-State's fork](https://github.com/kstateome/django-cas) of [the original](https://bitbucket.org/cpcc/django-cas/overview) and includes [several additional features](https://github.com/kstateome/django-cas/#additional-features) as well as features merged from
 
@@ -14,7 +14,7 @@ This is [K-State's fork](https://github.com/kstateome/django-cas) of [the or
 
 This project is registered on PyPi as django-cas-client.  To install::
 
-    pip install django-cas-client==1.3.0
+    pip install django-cas-client==1.4.0
 
 
 ### Add to URLs

cas/decorators.py

@@ -29,9 +29,16 @@ def user_passes_test(test_func, login_url=None, redirect_field_name=REDIRECT_FIE
     def decorator(view_func):
         @wraps(view_func)
         def wrapper(request, *args, **kwargs):
+
+            try:
+                # use callable for pre-django 2.0
+                is_authenticated = request.user.is_authenticated()
+            except TypeError:
+                is_authenticated = request.user.is_authenticated
+
             if test_func(request.user):
                 return view_func(request, *args, **kwargs)
-            elif request.user.is_authenticated():
+            elif is_authenticated:
                 return HttpResponseForbidden('<h1>Permission denied</h1>')
             else:
                 path = '%s?%s=%s' % (login_url, redirect_field_name,
@@ -65,7 +72,13 @@ def wrapped_f(*args):
             from cas.views import login
             request = args[0]
 
-            if request.user.is_authenticated():
+            try:
+                # use callable for pre-django 2.0
+                is_authenticated = request.user.is_authenticated()
+            except TypeError:
+                is_authenticated = request.user.is_authenticated
+
+            if is_authenticated:
                 # Is Authed, fine
                 pass
             else:

cas/middleware.py

@@ -9,9 +9,12 @@
 from django.contrib.auth import REDIRECT_FIELD_NAME
 from django.contrib.auth import logout as do_logout
 from django.contrib.auth.views import login, logout
-from django.core.urlresolvers import reverse
 from django.http import HttpResponseRedirect, HttpResponseForbidden
 from django.core.exceptions import ImproperlyConfigured
+try:
+    from django.urls import reverse
+except ImportError:
+    from django.core.urlresolvers import reverse
 try:
     from django.utils.deprecation import MiddlewareMixin
 except ImportError:
@@ -60,7 +63,13 @@ def process_view(self, request, view_func, view_args, view_kwargs):
         elif not view_func.__module__.startswith('django.contrib.admin.'):
             return None
 
-        if request.user.is_authenticated():
+        try:
+            # use callable for pre-django 2.0
+            is_authenticated = request.user.is_authenticated()
+        except TypeError:
+            is_authenticated = request.user.is_authenticated
+
+        if is_authenticated:
             if request.user.is_staff:
                 return None
             else:

cas/views.py

@@ -16,7 +16,11 @@
 from django.conf import settings
 from django.contrib.auth import REDIRECT_FIELD_NAME
 from django.contrib import auth
-from django.core.urlresolvers import reverse
+
+try:
+    from django.urls import reverse
+except ImportError:
+    from django.core.urlresolvers import reverse
 
 from cas.models import PgtIOU
 
@@ -166,7 +170,13 @@ def login(request, next_page=None, required=False, gateway=False):
     if not next_page:
         next_page = _redirect_url(request)
 
-    if request.user.is_authenticated():
+    try:
+        # use callable for pre-django 2.0
+        is_authenticated = request.user.is_authenticated()
+    except TypeError:
+        is_authenticated = request.user.is_authenticated
+
+    if is_authenticated:
         return HttpResponseRedirect(next_page)
 
     ticket = request.GET.get('ticket')

docs/source/changelog.rst

@@ -1,6 +1,10 @@
 Changelog
 =========
 
+1.4.0
+------------------
+- Compatibility with Django 2.0 (https://github.com/kstateome/django-cas/pull/72)
+
 1.3.0
 ------------------
 

docs/source/conf.py

@@ -58,9 +58,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.3.0'
+version = '1.4.0'
 # The full version, including alpha/beta/rc tags.
-release = '1.3.0'
+release = '1.4.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.py

@@ -2,7 +2,7 @@
 
 from setuptools import setup, find_packages
 
-version = '1.3.0'
+version = '1.4.0'
 
 
 def read(fname):