Merge pull request #11 from kckaiwei/master

Adding Django 3.0 support

.travis.yml

@@ -1,9 +1,11 @@
 sudo: false
-dist: trusty
+dist: xenial
 language: python
 python:
   - "2.7"
   - "3.6"
+  - "3.7"
+  - "3.8"
 addons:
   postgresql: "9.5"
 env:
@@ -15,12 +17,30 @@ env:
     - DJANGO=1.11
     - DJANGO=2.0
     - DJANGO=2.1
+    - DJANGO=3.0
+    - DJANGO=3.0.7
 matrix:
   exclude:
     - python: "2.7"
       env: DJANGO=2.0
     - python: "2.7"
       env: DJANGO=2.1
+    - python: "2.7"
+      env: DJANGO=3.0
+    - python: "2.7"
+      env: DJANGO=3.0.7
+    - python: "3.7"
+      env: DJANGO=1.9
+    - python: "3.7"
+      env: DJANGO=1.10
+    - python: "3.7"
+      env: DJANGO=1.11
+    - python: "3.8"
+      env: DJANGO=1.9
+    - python: "3.8"
+      env: DJANGO=1.10
+    - python: "3.8"
+      env: DJANGO=1.11
 install:
   - pip install django==${DJANGO} Pillow psycopg2
   - pip install .

jsonate/fields.py

@@ -27,7 +27,7 @@ def _deserialize(self, value):
 
         return value
 
-    def from_db_value(self, value, expression, connection, context):
+    def from_db_value(self, value, expression, connection, context=None):
         return self._deserialize(value)
 
     def to_python(self, value):

test_project/settings.py

@@ -24,6 +24,26 @@
     os.path.join(PROJECT_ROOT, 'templates'),
 )
 
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'APP_DIRS': True,
+        'OPTIONS': {
+            'context_processors': [
+                "django.contrib.auth.context_processors.auth",
+                "django.template.context_processors.debug",
+                "django.template.context_processors.i18n",
+                "django.template.context_processors.media",
+                "django.template.context_processors.static",
+                "django.template.context_processors.tz",
+                "django.template.context_processors.request",
+                "django.contrib.messages.context_processors.messages",
+            ],
+            'debug': True,
+        },
+    }
+]
+
 SECRET_KEY = "dna_kzxq8(QbM=-#ZyyA&k,Fi1LU>&bQ4ZA+|(e<g-.%L0JnaK"
 
 MIDDLEWARE_CLASSES = (
@@ -34,6 +54,8 @@
     'django.contrib.messages.middleware.MessageMiddleware',
 )
 
+MIDDLEWARE = MIDDLEWARE_CLASSES
+
 ROOT_URLCONF = 'test_project.urls'
 
 SITE_ID = 1
@@ -44,6 +66,7 @@
     'django.contrib.sessions',
     'django.contrib.sites',
     'django.contrib.admin',
+    'django.contrib.messages',
 
     'jsonate',
     'test_app',

test_project/test_app/tests.py

@@ -27,7 +27,8 @@ def destroy_media_folder(folder):
     [unlink(f) for f in glob(join(path, "*"))]
     try: rmdir(path)
     except: pass
-
+
+
 class JsonateTests(TestCase):        
     maxDiff = 10**4
     def setUp(self):