Django 3.0 Compatibility Patch

.gitignore

@@ -7,6 +7,7 @@ dist/
 .coverage/
 django_invitations.egg-info/
 .gitchangelog.rc
+git-push.bat
 .python-version
 .coverage
 /.idea/

README.md

@@ -1,5 +1,7 @@
 ## Django-invitations - Generic invitations app
 
+[WORKING ON PATCH FOR DJANGO 3.0 COMPATIBILITY]
+
 [![Build Status](https://travis-ci.org/bee-keeper/django-invitations.svg?branch=master)](https://travis-ci.org/bee-keeper/django-invitations)
 
 [![Coverage Status](https://coveralls.io/repos/bee-keeper/django-invitations/badge.svg?branch=master&service=github)](https://coveralls.io/github/bee-keeper/django-invitations?branch=master)

invitations/base_invitation.py

@@ -1,6 +1,6 @@
 from django.conf import settings
 from django.db import models
-from django.utils.encoding import python_2_unicode_compatible
+from six import python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _
 
 from .managers import BaseInvitationManager

invitations/models.py

@@ -9,7 +9,7 @@
 from django.db import models
 from django.utils import timezone
 from django.utils.crypto import get_random_string
-from django.utils.encoding import python_2_unicode_compatible
+from six import python_2_unicode_compatible
 from django.utils.translation import ugettext_lazy as _
 
 from . import signals

invitations/utils.py

@@ -1,6 +1,6 @@
 from django.apps import apps as django_apps
 from django.core.exceptions import ImproperlyConfigured
-from django.utils import six
+import six
 
 from .app_settings import app_settings
 

requirements.txt

@@ -5,4 +5,5 @@ mock==3.0.5
 pytest==5.2.2
 pytest-django==3.6.0
 pytest-cov==2.8.1
+six==1.14.0
 tox==3.14.0

test_urls.py

@@ -1,4 +1,7 @@
-from django.conf.urls import url, include
+try:
+    from django.conf.urls import url, include
+except ImportError:
+    from django.urls import url, include
 from django.contrib import admin
 from django.conf import settings
 

tox.ini

@@ -3,7 +3,7 @@ envlist =
   py35-django{111,22}-backend{Basic,Allauth}
   py36-django{111,22}-backend{Basic,Allauth}
   py37-django{111,22}-backend{Basic,Allauth}
-  py38-django22-backend{Basic,Allauth}
+  py38-django{22,3}-backend{Basic,Allauth}
   flake8
 
 [pytest]
@@ -16,7 +16,8 @@ deps =
   -r requirements.txt
   django111: Django>=1.11.17,<2.0
   django22: Django>=2.2.6
-  backendAllauth: django-allauth
+  django3: Django>=3
+  backendAllauth: django-allauth==0.40.0
 commands =
   python -V
   backendBasic: py.test --cov-report term --cov=invitations  --ignore=tests/allauth/  --ds=test_settings tests