Merge pull request #55 from yceruto/django3_support

Add django3 support

Author: yceruto

.travis.yml

@@ -1,14 +1,21 @@
-sudo: required
-dist: xenial
 language: python
 
 python:
   - 3.5
   - 3.6
   - 3.7
+  - 3.8
 
 env:
   - DJANGO_VERSION=2.*
+  - DJANGO_VERSION=3.*
+
+matrix:
+  exclude:
+    - python: 3.5
+      env: DJANGO_VERSION=3.*
+    - python: 3.8
+      env: DJANGO_VERSION=2.*
 
 install:
   - pip install django==$DJANGO_VERSION

django_ajax/decorators.py

@@ -3,10 +3,9 @@
 """
 from __future__ import unicode_literals
 
-from functools import wraps
+from functools import wraps, WRAPPER_ASSIGNMENTS
 
 from django.http import HttpResponseBadRequest
-from django.utils.decorators import available_attrs
 
 from django_ajax.shortcuts import render_to_json
 
@@ -57,7 +56,7 @@ def my_view(request):
 
     """
     def decorator(func):
-        @wraps(func, assigned=available_attrs(func))
+        @wraps(func, assigned=WRAPPER_ASSIGNMENTS)
         def inner(request, *args, **kwargs):
             if mandatory and not request.is_ajax():
                 return HttpResponseBadRequest()

tests/ajaxdecorator/app/tests.py

@@ -1,7 +1,6 @@
 from __future__ import unicode_literals
 from datetime import datetime
 from django.test import TestCase
-from django.utils import six
 from django_ajax.encoder import LazyJSONEncoder
 import json
 
@@ -18,7 +17,7 @@ def post(self, uri, data=None):
 
         self.assertEquals(200, resp.status_code)
         self.assertEquals('application/json', response['Content-Type'])
-        if isinstance(response.content, six.text_type):
+        if isinstance(response.content, str):
             return response, json.loads(response.content)
         else:
             return response, json.loads(response.content.decode('utf-8'))

tests/ajaxmiddleware/app/tests.py

@@ -1,7 +1,6 @@
 from __future__ import unicode_literals
 from datetime import datetime
 from django.test import TestCase
-from django.utils import six
 from django_ajax.encoder import LazyJSONEncoder
 import json
 
@@ -18,7 +17,7 @@ def post(self, uri, data=None):
 
         self.assertEquals(200, resp.status_code)
         self.assertEquals('application/json', response['Content-Type'])
-        if isinstance(response.content, six.text_type):
+        if isinstance(response.content, str):
             return response, json.loads(response.content)
         else:
             return response, json.loads(response.content.decode('utf-8'))