Merge pull request #166 from OskarPersson/dj3

Add Django 3.0 support

Author: knaperek

.travis.yml

@@ -28,14 +28,38 @@ matrix:
       env: TOX_ENV=py35-django111
     - python: 3.6
       env: TOX_ENV=py36-django111
+    - python: 3.4
+      env: TOX_ENV=py34-django20
+    - python: 3.5
+      env: TOX_ENV=py35-django20
+    - python: 3.6
+      env: TOX_ENV=py36-django20
+    - python: 3.7
+      env: TOX_ENV=py37-django20
     - python: 3.5
-      env: TOX_ENV=py35-djangomaster
+      env: TOX_ENV=py35-django21
+    - python: 3.6
+      env: TOX_ENV=py36-django21
+    - python: 3.7
+      env: TOX_ENV=py37-django21
+    - python: 3.5
+      env: TOX_ENV=py35-django22
+    - python: 3.6
+      env: TOX_ENV=py36-django22
+    - python: 3.7
+      env: TOX_ENV=py37-django22
+    - python: 3.6
+      env: TOX_ENV=py36-django30
+    - python: 3.7
+      env: TOX_ENV=py37-django30
     - python: 3.6
       env: TOX_ENV=py36-djangomaster
+    - python: 3.7
+      env: TOX_ENV=py37-djangomaster
   fast_finish: true
   allow_failures:
-    - env: TOX_ENV=py35-djangomaster
     - env: TOX_ENV=py36-djangomaster
+    - env: TOX_ENV=py37-djangomaster
 
 addons:
   apt:

djangosaml2/tests/__init__.py

@@ -35,7 +35,10 @@
     from django.utils.encoding import force_text
 except ImportError:
     from django.utils.text import force_text
-from django.utils.six.moves.urllib.parse import urlparse, parse_qs
+try:
+    from django.utils.six.moves.urllib.parse import urlparse, parse_qs
+except ImportError:
+    from urllib.parse import urlparse, parse_qs
 
 from saml2.config import SPConfig
 from saml2.s_utils import decode_base64_and_inflate, deflate_and_base64_encode

djangosaml2/views.py

@@ -32,7 +32,15 @@
 from django.views.decorators.http import require_POST
 from django.shortcuts import render
 from django.template import TemplateDoesNotExist
-from django.utils.six import text_type, binary_type, PY3
+
+try:
+    from django.utils.six import text_type, binary_type, PY3
+except ImportError:
+    import sys
+    PY3 = sys.version_info[0] == 3
+    text_type = str
+    binary_type = bytes
+
 from django.views.decorators.csrf import csrf_exempt
 
 from saml2 import BINDING_HTTP_REDIRECT, BINDING_HTTP_POST

tox.ini

@@ -4,7 +4,11 @@ envlist =
     py{27,34,35}-django19
     py{27,34,35}-django110
     py{27,34,35,36}-django111
-    py{35,36}-djangomaster
+    py{34,35,36,37}-django20
+    py{35,36,37}-django21
+    py{35,36,37}-django22
+    py{36,37}-django30
+    py{36,37}-djangomaster
 
 [testenv]
 commands =
@@ -15,6 +19,10 @@ deps =
     django19: Django>=1.9,<1.10
     django110: Django>=1.10,<1.11
     django111: Django>=1.11,<2.0
+    django20: Django>=2.0,<2.1
+    django21: Django>=2.1,<2.2
+    django22: Django>=2.2,<3.0
+    django30: Django>=3.0,<3.1
     djangomaster: https://github.com/django/django/archive/master.tar.gz
     .[test]