updated 2.0 conversion

Author: Maffooch

tastypie_swagger/mapping.py

@@ -159,13 +159,13 @@ def build_parameters_for_list(self, method='GET'):
 
     def build_parameters_from_ordering(self):
         values = []
-        [values.extend([field,"-%s"%field]) for field in self.schema['ordering']]
+        [values.extend([field, "-%s" % field]) for field in self.schema['ordering']]
         return {
             'paramType': "query",
             'name': "order_by",
             'dataType': "String",
             'required': False,
-            'description': unicode("Orders the result set based on the selection. "
+            'description': str("Orders the result set based on the selection. "
                                    "Ascending order by default, prepending the '-' "
                                    "sign change the sorting order to descending"),
             'allowableValues': {
@@ -212,12 +212,7 @@ def build_parameters_from_filters(self, prefix="", method='GET'):
                             #This code has been mostly sucked from the tastypie lib
                             if getattr(self.resource._meta, 'queryset', None) is not None:
                                 # Get the possible query terms from the current QuerySet.
-                                if hasattr(self.resource._meta.queryset.query.query_terms, 'keys'):
-                                    # Django 1.4 & below compatibility.
-                                    field = self.resource._meta.queryset.query.query_terms.keys()
-                                else:
-                                    # Django 1.5+.
-                                    field = self.resource._meta.queryset.query.query_terms
+                                field = QUERY_TERMS
                             else:
                                 if hasattr(QUERY_TERMS, 'keys'):
                                     # Django 1.4 & below compatibility.

tastypie_swagger/urls.py

@@ -1,13 +1,18 @@
 try:
-	from django.conf.urls import patterns, include, url
+    from django.urls import include, re_path as url
 except ImportError:
-	from django.conf.urls.defaults import patterns, include, url
+    try:
+        from django.conf.urls import patterns, include, url
+    except ImportError:
+        from django.conf.urls.defaults import patterns, include, url
 
 from .views import SwaggerView, ResourcesView, SchemaView
 
-urlpatterns = patterns('',
+app_name = 'tastypie_swagger'
+
+urlpatterns = [
     url(r'^$', SwaggerView.as_view(), name='index'),
     url(r'^resources/$', ResourcesView.as_view(), name='resources'),
     url(r'^schema/(?P<resource>\S+)$', SchemaView.as_view()),
     url(r'^schema/$', SchemaView.as_view(), name='schema'),
-)
+]

tastypie_swagger/views.py

@@ -4,7 +4,10 @@
 from django.views.generic import TemplateView
 from django.http import HttpResponse, Http404
 from django.core.exceptions import ImproperlyConfigured
-from django.urls import reverse
+try:
+    from django.core.urlresolvers import reverse
+except ImportError:
+    from django.urls import reverse
 
 import tastypie