Merge pull request #54 from richardbarran/django22

Django 2.2+ compatibility

.gitignore

@@ -3,6 +3,7 @@
 *.pyc
 .project
 .pydevproject
+.idea/
 .settings
 dist/
 build/

docs/changes.rst

@@ -2,6 +2,11 @@
 Changelog
 =========
 
+trunk
+-----
+
+ - Django 2.1, 2.2 compatibility
+
 1.3.0
 -----
 

envelope/views.py

@@ -73,7 +73,7 @@ def get_initial(self):
         """
         initial = super(ContactView, self).get_initial().copy()
         user = self.request.user
-        if user.is_authenticated():
+        if user.is_authenticated() if callable(user.is_authenticated) else user.is_authenticated:
             # the user might not have a full name set in the model
             if user.get_full_name():
                 sender = '%s (%s)' % (user.get_username(), user.get_full_name())

example_project/settings.py

@@ -33,9 +33,8 @@
 
 SECRET_KEY = 'n5)bgcx7xwk^fhnv+w&qaap)lryz8in*a293=!d=*!%js7^mdr'
 
-MIDDLEWARE_CLASSES = (
+MIDDLEWARE = (
     'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',

tests/settings.py

@@ -32,9 +32,8 @@
     }
 }
 
-MIDDLEWARE_CLASSES = (
+MIDDLEWARE = (
     'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',

tests/test_views.py

@@ -10,7 +10,12 @@
 
 from django.conf import settings
 from django.contrib.auth.models import User
-from django.core.urlresolvers import reverse
+
+try:
+    from django.core.urlresolvers import reverse
+except ImportError:
+    from django.urls import reverse
+
 from django.test import TestCase
 
 try:

tox.ini

@@ -22,4 +22,4 @@ DJANGO =
     1.11: django111
     2.2: django22
     3.0: django30
-    master: djangomaster
+    master: djangomaster