Merge lp:~ricardokirkner/django-piston/django-1.11 into lp:django-piston

[Ricardo Kirkner]

support django up to 1.11

[Matias Bordese (matiasb)]

LGTM

review: Approve

=== modified file 'demo/urls.py'
--- demo/urls.py	2015-04-24 22:17:32 +0000
+++ demo/urls.py	2017-04-18 17:58:53 +0000
@@ -1,11 +1,10 @@
-from django.conf.urls import patterns, include, url
+from django.conf.urls import include, url
 from django.contrib import admin
 
-urlpatterns = patterns(
-    '',
+urlpatterns = [
     # Examples:
     # url(r'^$', 'demo.views.home', name='home'),
     # url(r'^blog/', include('blog.urls')),
 
     url(r'^admin/', include(admin.site.urls)),
-)
+]
 
=== modified file 'piston/emitters.py'
--- piston/emitters.py	2015-04-27 15:30:47 +0000
+++ piston/emitters.py	2017-04-18 17:58:53 +0000
@@ -17,7 +17,10 @@
 from django.utils.xmlutils import SimplerXMLGenerator
 from django.utils.encoding import smart_unicode
 from django.core.urlresolvers import NoReverseMatch
-from django.core.serializers.json import DateTimeAwareJSONEncoder
+try:
+    from django.core.serializers.json import DjangoJSONEncoder
+except ImportError:
+    from django.core.serializers.json import DateTimeAwareJSONEncoder as DjangoJSONEncoder
 from django.http import HttpResponse
 from django.core import serializers
 
@@ -86,7 +89,7 @@
             ret = None
 
             # return anything we've already seen as a string only
-            # this prevents infinite recursion in the case of recursive 
+            # this prevents infinite recursion in the case of recursive
             # relationships
 
             if thing in self.stack:
@@ -160,8 +163,8 @@
                 # the nested models won't appear properly
                 # Refs #157
                 if handler:
-                    fields = getattr(handler, 'fields')    
-                
+                    fields = getattr(handler, 'fields')
+
                 if not fields or hasattr(handler, 'fields'):
                     """
                     Fields was not specified, try to find teh correct
@@ -177,7 +180,7 @@
                     if not get_fields:
                         get_fields = set([ f.attname.replace("_id", "", 1)
                             for f in data._meta.fields + data._meta.virtual_fields])
-                    
+
                     if hasattr(mapped, 'extra_fields'):
                         get_fields.update(mapped.extra_fields)
 
@@ -391,7 +394,7 @@
     """
     def render(self, request):
         cb = request.GET.get('callback', None)
-        seria = json.dumps(self.construct(), cls=DateTimeAwareJSONEncoder, ensure_ascii=False, indent=4)
+        seria = json.dumps(self.construct(), cls=DjangoJSONEncoder, ensure_ascii=False, indent=4)
 
         # Callback
         if cb and is_valid_jsonp_callback_value(cb):
 
=== modified file 'tox.ini'
--- tox.ini	2015-04-24 22:17:32 +0000
+++ tox.ini	2017-04-18 17:58:53 +0000
@@ -1,41 +1,54 @@
 [tox]
 envlist =
-    py2.7-django1.4, py2.7-django1.5, py2.7-django1.6, py2.7-django1.7, py2.7-django1.8
+    py27-django1.4, py27-django1.5, py27-django1.6, py27-django1.7, py27-django1.8, py27-django1.9, py27-django1.10, py27-django1.11
 
 [testenv]
 commands = python manage.py test piston
 deps=
     mock
 
-[testenv:py2.7-django1.4]
+[testenv:py27]
 basepython = python2.7
+
+[testenv:py27-django1.4]
 deps =
     django >= 1.4, < 1.5
+    south==1.0
     {[testenv]deps}
-    south==1.0
 
-[testenv:py2.7-django1.5]
-basepython = python2.7
+[testenv:py27-django1.5]
 deps =
     django >= 1.5, < 1.6
+    south==1.0
     {[testenv]deps}
-    south==1.0
 
-[testenv:py2.7-django1.6]
-basepython = python2.7
+[testenv:py27-django1.6]
 deps =
     django >= 1.6, < 1.7
+    south==1.0
     {[testenv]deps}
-    south==1.0
 
-[testenv:py2.7-django1.7]
-basepython = python2.7
+[testenv:py27-django1.7]
 deps =
     django >= 1.7, < 1.8
     {[testenv]deps}
 
-[testenv:py2.7-django1.8]
-basepython = python2.7
+[testenv:py27-django1.8]
 deps =
     django >= 1.8, < 1.9
     {[testenv]deps}
+
+[testenv:py27-django1.9]
+deps =
+    django >= 1.9, < 1.10
+    {[testenv]deps}
+
+[testenv:py27-django1.10]
+deps =
+    django >= 1.10, < 1.11
+    {[testenv]deps}
+
+[testenv:py27-django1.11]
+deps =
+    django >= 1.11, < 1.12
+    {[testenv]deps}