Merge branch 'master' of github.com:altschool/dynamic-rest

Author: aleontiev

dynamic_rest/datastructures.py

@@ -1,5 +1,5 @@
 """This module contains custom data-structures."""
-from django.utils import six
+import six
 
 
 class TreeMap(dict):

dynamic_rest/fields/fields.py

@@ -3,7 +3,7 @@
 import importlib
 import pickle
 
-from django.utils import six
+import six
 from django.utils.functional import cached_property
 from rest_framework import fields
 from rest_framework.exceptions import ValidationError, ParseError

dynamic_rest/filters.py

@@ -3,7 +3,7 @@
 from django.core.exceptions import ValidationError as InternalValidationError
 from django.core.exceptions import ImproperlyConfigured
 from django.db.models import Q, Prefetch, Manager
-from django.utils import six
+import six
 from rest_framework import serializers
 from rest_framework.exceptions import ValidationError
 from rest_framework.fields import BooleanField, NullBooleanField
@@ -667,8 +667,11 @@ def filter_queryset(self, request, queryset, view):
 
         ordering = self.get_ordering(request, queryset, view)
         if ordering:
-            return queryset.order_by(*ordering)
-
+            queryset = queryset.order_by(*ordering)
+            if any(['__' in o for o in ordering]):
+                # add distinct() to remove duplicates
+                # in case of order-by-related
+                queryset = queryset.distinct()
         return queryset
 
     def get_ordering(self, request, queryset, view):

dynamic_rest/links.py

@@ -1,6 +1,5 @@
 """This module contains utilities to support API links."""
-from django.utils import six
-
+import six
 from dynamic_rest.conf import settings
 from dynamic_rest.routers import DynamicRouter
 

dynamic_rest/processors.py

@@ -1,7 +1,7 @@
 """This module contains response processors."""
 from collections import defaultdict
 
-from django.utils import six
+import six
 from rest_framework.serializers import ListSerializer
 from rest_framework.utils.serializer_helpers import ReturnDict
 

dynamic_rest/routers.py

@@ -8,7 +8,7 @@
 except ImportError:
     from django.core.urlresolvers import get_script_prefix
 
-from django.utils import six
+import six
 
 import rest_framework
 from rest_framework import views

dynamic_rest/serializers.py

@@ -5,7 +5,7 @@
 
 import inflection
 from django.db import models
-from django.utils import six
+import six
 from django.utils.functional import cached_property
 from rest_framework import __version__ as drf_version
 from rest_framework import exceptions, fields, serializers

dynamic_rest/utils.py

@@ -1,4 +1,4 @@
-from django.utils.six import string_types
+from six import string_types
 
 FALSEY_STRINGS = (
     '0',

dynamic_rest/viewsets.py

@@ -1,7 +1,7 @@
 """This module contains custom viewset classes."""
 from django.core.exceptions import ObjectDoesNotExist
 from django.http import QueryDict
-from django.utils import six
+import six
 from django.db import transaction, IntegrityError
 from rest_framework import exceptions, status, viewsets
 from rest_framework.exceptions import ValidationError

install_requires.txt

@@ -1,4 +1,4 @@
-Django>=1.11,<3.0.0
+Django>=1.11,<3.1.2
 djangorestframework>=3.8.0,<3.12.0
-inflection>=0.3.1
+inflection>=0.4.0
 requests