Merge ~woutervb/django-piston:django2 into django-piston:master

[Wouter van Bommel]

Implement the changes so that django-piston is compatible with django2.

We will need out own version, as the one found on internet / github does not include the migrations (and has other changes which might not be compatible)

[Natalia Bidart (nataliabidart)]

Hey Wouter, thanks for this work. A few suggestions/comments:

1- the demo/settings.py needs modernizing for the TEMPLATE_DEBUG setting
2- it seems like the demo/urls.py hasn't been migrated to Django2, did you happen to confirm that demo project works?
3- any reason to import json as simplejson instead of just migrating references to simplesjson->json?

And I added a few inline commnets below.

review: Needs Information

[Wouter van Bommel (woutervb)]

Hi Natalia,

Some responses inline.

1 - will look into that, I did not run the demo and the unittest did not pick this up
2 - same
3 - Can make that change, is probably cleaner

[Natalia Bidart (nataliabidart)]

Thanks Wouter, overall looks good but I wonder about the tox min version, in xenial we get as new as 2.3.1, is it 3.13 really needed?

review: Approve

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..5ec9e22
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+.bzr/
+.tox/
+*.sqlite3
+__pycache__/
+*.egg-info/
+build/
+dist/
diff --git a/demo/settings.py b/demo/settings.py
index 8fe3b5f..897f821 100644
--- a/demo/settings.py
+++ b/demo/settings.py
@@ -42,23 +42,34 @@ INSTALLED_APPS = (
     'piston',
 )
 
-MIDDLEWARE_CLASSES = [
+MIDDLEWARE = [
+    'django.middleware.security.SecurityMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
     'django.middleware.common.CommonMiddleware',
     'django.middleware.csrf.CsrfViewMiddleware',
     'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
 ]
 
-if django.VERSION < (1, 7):
-    INSTALLED_APPS += ('south',)
-    MIDDLEWARE_CLASSES.remove(
-        'django.contrib.auth.middleware.SessionAuthenticationMiddleware')
-
 ROOT_URLCONF = 'demo.urls'
 
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'DIRS': [],
+        'APP_DIRS': True,
+        'OPTIONS': {
+            'context_processors': [
+                'django.template.context_processors.debug',
+                'django.template.context_processors.request',
+                'django.contrib.auth.context_processors.auth',
+                'django.contrib.messages.context_processors.messages',
+            ],
+        },
+    },
+]
+
 WSGI_APPLICATION = 'demo.wsgi.application'
 
 
diff --git a/demo/urls.py b/demo/urls.py
index 5c75bae..70a00f1 100644
--- a/demo/urls.py
+++ b/demo/urls.py
@@ -6,5 +6,5 @@ urlpatterns = [
     # url(r'^$', 'demo.views.home', name='home'),
     # url(r'^blog/', include('blog.urls')),
 
-    url(r'^admin/', include(admin.site.urls)),
+    url(r'^admin/', admin.site.urls),
 ]
diff --git a/piston/__init__.py b/piston/__init__.py
index dc7d064..a5ec16b 100644
--- a/piston/__init__.py
+++ b/piston/__init__.py
@@ -1,4 +1,4 @@
-__version__ = '0.2.5'
+__version__ = '2.2.5'
 
 
 def get_version():
diff --git a/piston/authentication.py b/piston/authentication.py
index b02638d..f0cf1c6 100644
--- a/piston/authentication.py
+++ b/piston/authentication.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-from __future__ import absolute_import
 from builtins import object
 import binascii
 
@@ -10,7 +8,7 @@ from django.contrib.auth.decorators import login_required
 from django.template import loader
 from django.contrib.auth import authenticate
 from django.conf import settings
-from django.core.urlresolvers import get_callable
+from django.urls import get_callable
 from django.core.exceptions import ImproperlyConfigured
 from django.shortcuts import render_to_response
 from django.template import RequestContext
diff --git a/piston/doc.py b/piston/doc.py
index a9aa009..d7d21da 100644
--- a/piston/doc.py
+++ b/piston/doc.py
@@ -5,7 +5,7 @@ import inspect
 
 from piston.handler import HandlerMetaClass, handler_tracker
 
-from django.core.urlresolvers import get_resolver, get_callable, get_script_prefix
+from django.urls import get_resolver, get_callable, get_script_prefix
 from django.shortcuts import render_to_response
 from django.template import RequestContext
 
diff --git a/piston/emitters.py b/piston/emitters.py
index 79e9fb1..826ff12 100644
--- a/piston/emitters.py
+++ b/piston/emitters.py
@@ -1,6 +1,6 @@
-from __future__ import absolute_import, generators
-from future import standard_library
-standard_library.install_aliases()
+import decimal, re, inspect
+import copy
+
 from builtins import str
 from past.builtins import basestring
 from builtins import object
@@ -18,10 +18,10 @@ except ImportError:
     yaml = None
 
 from django.db.models.query import QuerySet
-from django.db.models import Model, permalink
+from django.db.models import Model
 from django.utils.xmlutils import SimplerXMLGenerator
 from django.utils.encoding import smart_text
-from django.core.urlresolvers import NoReverseMatch
+from django.urls import reverse, NoReverseMatch
 try:
     from django.core.serializers.json import DjangoJSONEncoder
 except ImportError:
@@ -36,7 +36,7 @@ import io as StringIO
 import pickle as pickle
 
 # Allow people to change the reverser (default `permalink`).
-reverser = permalink
+reverser = reverse
 
 class Emitter(object):
     """
diff --git a/piston/handler.py b/piston/handler.py
index 12a0540..2b2b11a 100644
--- a/piston/handler.py
+++ b/piston/handler.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 from builtins import str
 from builtins import object
 import warnings
diff --git a/piston/migrations/0001_initial.py b/piston/migrations/0001_initial.py
index e5948ee..97f8ea4 100644
--- a/piston/migrations/0001_initial.py
+++ b/piston/migrations/0001_initial.py
@@ -1,6 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 from django.conf import settings
 import time
@@ -22,7 +20,7 @@ class Migration(migrations.Migration):
                 ('key', models.CharField(max_length=18)),
                 ('secret', models.CharField(max_length=32)),
                 ('status', models.CharField(default='pending', max_length=16, choices=[('pending', 'Pending'), ('accepted', 'Accepted'), ('canceled', 'Canceled'), ('rejected', 'Rejected')])),
-                ('user', models.ForeignKey(related_name='consumers', blank=True, to=settings.AUTH_USER_MODEL, null=True)),
+                ('user', models.ForeignKey(related_name='consumers', blank=True, to=settings.AUTH_USER_MODEL, null=True, on_delete=models.CASCADE)),
             ],
         ),
         migrations.CreateModel(
@@ -46,8 +44,8 @@ class Migration(migrations.Migration):
                 ('is_approved', models.BooleanField(default=False)),
                 ('callback', models.CharField(max_length=255, null=True, blank=True)),
                 ('callback_confirmed', models.BooleanField(default=False)),
-                ('consumer', models.ForeignKey(to='piston.Consumer')),
-                ('user', models.ForeignKey(related_name='tokens', blank=True, to=settings.AUTH_USER_MODEL, null=True)),
+                ('consumer', models.ForeignKey(to='piston.Consumer', on_delete=models.CASCADE)),
+                ('user', models.ForeignKey(related_name='tokens', blank=True, to=settings.AUTH_USER_MODEL, null=True, on_delete=models.CASCADE)),
             ],
         ),
     ]
diff --git a/piston/models.py b/piston/models.py
index 4fa1f2c..8df4925 100644
--- a/piston/models.py
+++ b/piston/models.py
@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from future import standard_library
-standard_library.install_aliases()
 import time
 import urllib.request, urllib.parse, urllib.error
 import urllib.parse
@@ -45,7 +42,7 @@ class Consumer(models.Model):
     secret = models.CharField(max_length=SECRET_SIZE)
 
     status = models.CharField(max_length=16, choices=CONSUMER_STATES, default='pending')
-    user = models.ForeignKey(User, null=True, blank=True, related_name='consumers')
+    user = models.ForeignKey(User, null=True, blank=True, related_name='consumers', on_delete=models.CASCADE)
 
     objects = ConsumerManager()
         
@@ -86,8 +83,8 @@ class Token(models.Model):
     timestamp = models.IntegerField(default=time.time)
     is_approved = models.BooleanField(default=False)
     
-    user = models.ForeignKey(User, null=True, blank=True, related_name='tokens')
-    consumer = models.ForeignKey(Consumer)
+    user = models.ForeignKey(User, null=True, blank=True, related_name='tokens', on_delete=models.CASCADE)
+    consumer = models.ForeignKey(Consumer, on_delete=models.CASCADE)
     
     callback = models.CharField(max_length=255, null=True, blank=True)
     callback_confirmed = models.BooleanField(default=False)
diff --git a/piston/resource.py b/piston/resource.py
index 2a63c27..0470245 100644
--- a/piston/resource.py
+++ b/piston/resource.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 from builtins import str
 from builtins import object
 import sys
@@ -337,6 +336,6 @@ class Resource(object):
                 self.email_exception(rep)
             if self.display_errors:
                 return HttpResponseServerError(
-                    format_error('\n'.join(rep.format_exception())))
+                    format_error('\n'.join(rep.get_traceback_data())))
             else:
                 raise
diff --git a/piston/signals.py b/piston/signals.py
index 5d0336c..14fe196 100644
--- a/piston/signals.py
+++ b/piston/signals.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 # Piston imports
 from .utils import send_consumer_mail
 
diff --git a/piston/store.py b/piston/store.py
index ea43e63..007a349 100644
--- a/piston/store.py
+++ b/piston/store.py
@@ -1,4 +1,3 @@
-from __future__ import absolute_import
 from . import oauth
 
 from .models import Nonce, Token, Consumer
@@ -73,4 +72,4 @@ class DataStore(oauth.OAuthDataStore):
             self.request_token.verifier = generate_random(VERIFIER_SIZE)
             self.request_token.save()
             return self.request_token
-        return None
\ No newline at end of file
+        return None
diff --git a/piston/utils.py b/piston/utils.py
index c952bb9..8e76718 100644
--- a/piston/utils.py
+++ b/piston/utils.py
@@ -1,5 +1,3 @@
-from __future__ import print_function
-from __future__ import absolute_import
 from builtins import str
 from past.builtins import basestring
 from builtins import object
diff --git a/tox.ini b/tox.ini
index 00bc6ab..f174604 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,62 +1,9 @@
 [tox]
 envlist =
-    py27-django1.4, py27-django1.5, py27-django1.6, py27-django1.7, py27-django1.8, py27-django1.9, py27-django1.10, py27-django1.11, py35-django1.11
+  py36, py37, py38
+skip_missing_interpreters = true
 
 [testenv]
 commands = python manage.py test piston
-deps = mock
-install_command = pip install -i https://pypi.org/simple {opts} {packages}
-
-[testenv:py27]
-basepython = python2.7
-
-[testenv:py35]
-basepython = python3.5
-
-[testenv:py27-django1.4]
-deps =
-    django >= 1.4, < 1.5
-    south==1.0
-    {[testenv]deps}
-
-[testenv:py27-django1.5]
-deps =
-    django >= 1.5, < 1.6
-    south==1.0
-    {[testenv]deps}
-
-[testenv:py27-django1.6]
-deps =
-    django >= 1.6, < 1.7
-    south==1.0
-    {[testenv]deps}
-
-[testenv:py27-django1.7]
-deps =
-    django >= 1.7, < 1.8
-    {[testenv]deps}
-
-[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}
-
-[testenv:py35-django1.11]
 deps =
-    django >= 1.11, < 1.12
-    {[testenv]deps}
+  django>=2.2,<3