Merge pull request #57 from stgraham2000/master

Fixes #56: Support for Django 3.  Added envs in travis for python 3.7, 3.8

.gitignore

@@ -2,6 +2,9 @@
 *~
 \#*
 .\#*
+.history
+.mypy_cache
+.vscode
 
 # README.txt is just for the Cheeseshop; README.md is the authoritative one
 /README.txt

.travis.yml

@@ -3,9 +3,12 @@ python:
  - "3.4"
  - "3.5"
  - "3.6"
+ - "3.7"
+ - "3.8"
 env:
  - DJANGO_VERSION_MIN=1.11 DJANGO_VERSION_MAX=2.0
- - DJANGO_VERSION_MIN=2.2 DJANGO_VERSION_MAX=2.3
+ - DJANGO_VERSION_MIN=2.2 DJANGO_VERSION_MAX=3.0
+ - DJANGO_VERSION_MIN=3.0.3 DJANGO_VERSION_MAX=4.0
 install:
  - pip install "django>=$DJANGO_VERSION_MIN,<$DJANGO_VERSION_MAX"
  - "pip install -e ."
@@ -19,4 +22,8 @@ after_success:
 matrix:
   exclude:
   - python: "3.4"
-    env: DJANGO_VERSION_MIN=2.2 DJANGO_VERSION_MAX=2.3
+    env: DJANGO_VERSION_MIN=2.2 DJANGO_VERSION_MAX=3.0
+  - python: "3.4"
+    env: DJANGO_VERSION_MIN=3.0.3 DJANGO_VERSION_MAX=4.0
+  - python: "3.5"
+    env: DJANGO_VERSION_MIN=3.0.3 DJANGO_VERSION_MAX=4.0

django_prbac/fields.py

@@ -61,7 +61,7 @@ def formfield(self, **kwargs):
         defaults.update(kwargs)
         return super(StringListField, self).formfield(**defaults)
 
-    def from_db_value(self, value, expression, connection, context):
+    def from_db_value(self, value, expression, connection, *args, **kwargs):
         return self.to_python(value)
 
 
@@ -108,5 +108,5 @@ def get_prep_value(self, value):
         else:
             return super(StringSetField, self).get_prep_value(sorted(value))
 
-    def from_db_value(self, value, expression, connection, context):
+    def from_db_value(self, value, expression, connection, *args, **kwargs):
         return self.to_python(value)

django_prbac/models.py

@@ -6,9 +6,15 @@
 import weakref
 
 # Django imports
+from django import VERSION
 from django.db import models
 from django.conf import settings
-from django.utils.encoding import python_2_unicode_compatible
+if VERSION[0] < 3:
+    from django.utils.encoding import python_2_unicode_compatible
+else:
+    def python_2_unicode_compatible(fn):
+        return fn
+
 
 # External Library imports
 import jsonfield

setup.py

@@ -32,9 +32,9 @@ def get_readme():
     packages=find_packages(),
     zip_safe=False,
     install_requires=[
-        # avoid django 1 <1.11.28 and django 2 <2.2.10
+        # avoid django 1 <1.11.28 and django 2 <2.2.10 and django 3 < 3.0.3
         # https://github.com/advisories/GHSA-hmr4-m2h5-33qx
-        'django>=1.11.28,!=2.0.*,!=2.1.*,!=2.2.0,!=2.2.1,!=2.2.2,!=2.2.3,!=2.2.4,!=2.2.5,!=2.2.6,!=2.2.7,!=2.2.8,!=2.2.9,<3',
+        'django>=1.11.28,!=2.0.*,!=2.1.*,!=2.2.0,!=2.2.1,!=2.2.2,!=2.2.3,!=2.2.4,!=2.2.5,!=2.2.6,!=2.2.7,!=2.2.8,!=2.2.9,!=3.0.0,!=3.0.1,!=3.0.2,<4',
         'jsonfield>=1.0.3,<3',
         'simplejson',
         'six',