Removed compatibility code from supporting DRF 2.4

Author: jerel

rest_framework_json_api/pagination.py

@@ -1,110 +1,14 @@
 """
 Pagination fields
 """
-# pylint: disable=no-init, too-few-public-methods, no-self-use
-from collections import OrderedDict
-
 from rest_framework import serializers
-from rest_framework import pagination
 from rest_framework.views import Response
+from rest_framework.compat import OrderedDict
+from rest_framework.pagination import PageNumberPagination
 from rest_framework.templatetags.rest_framework import replace_query_param
 
-# DRF 2.4.X compatibility.
-ReadOnlyField = getattr(serializers, 'ReadOnlyField', serializers.Field)
-
-
-class NextPageLinkField(ReadOnlyField):
-    """
-    Field that returns a link to the next page in paginated results.
-    """
-    page_field = 'page'
-
-    def to_representation(self, value):
-        if not value.has_next():
-            return None
-        page = value.next_page_number()
-        request = self.context.get('request')
-        url = request and request.build_absolute_uri() or ''
-        return replace_query_param(url, self.page_field, page)
-
-
-class NextPageField(ReadOnlyField):
-    """
-    Field that returns a the next page number in paginated results.
-    """
-    page_field = 'page'
-
-    def to_representation(self, value):
-        if not value.has_next():
-            return None
-        return value.next_page_number()
-
-
-class PreviousPageLinkField(ReadOnlyField):
-    """
-    Field that returns a link to the previous page in paginated results.
-    """
-    page_field = 'page'
-
-    def to_representation(self, value):
-        if not value.has_previous():
-            return None
-        page = value.previous_page_number()
-        request = self.context.get('request')
-        url = request and request.build_absolute_uri() or ''
-        return replace_query_param(url, self.page_field, page)
-
-
-class PreviousPageField(ReadOnlyField):
-    """
-    Field that returns the previous page number in paginated results.
-    """
-    page_field = 'page'
-
-    def to_representation(self, value):
-        if not value.has_previous():
-            return None
-        return value.previous_page_number()
-
-
-class PageField(ReadOnlyField):
-    """
-    Field that returns the current page number in paginated results.
-    """
-    page_field = 'page'
-
-    def to_representation(self, value):
-        return value.number
-
-
-# compatibility for DRF 3.0 and older
-try:
-    BasePagination = pagination.PageNumberPagination
-except:
-    BasePagination = pagination.BasePaginationSerializer
-
-
-class PaginationSerializer(BasePagination):
-    """
-    Pagination serializer.
-    """
-    next = NextPageField(source='*')
-    next_link = NextPageLinkField(source='*')
-    page = PageField(source='*')
-    previous = PreviousPageField(source='*')
-    previous_link = PreviousPageLinkField(source='*')
-    count = ReadOnlyField(source='paginator.count')
-    total = ReadOnlyField(source='paginator.num_pages')
-
-
-class EmberPaginationSerializer(PaginationSerializer):
-    """
-    Backwards compatibility for name change
-    """
-    pass
-
 
-class PageNumberPagination(BasePagination):
+class PageNumberPagination(PageNumberPagination):
     """
     A json-api compatible pagination format
     """

rest_framework_json_api/utils.py

@@ -5,17 +5,13 @@
 from django.conf import settings
 from django.utils import six, encoding
 from django.utils.translation import ugettext_lazy as _
+from rest_framework.compat import OrderedDict
 from rest_framework.serializers import BaseSerializer, ListSerializer, ModelSerializer
 from rest_framework.relations import RelatedField, HyperlinkedRelatedField, PrimaryKeyRelatedField, \
     HyperlinkedIdentityField
 from rest_framework.settings import api_settings
 from rest_framework.exceptions import APIException
 
-try:
-    from rest_framework.compat import OrderedDict
-except ImportError:
-    OrderedDict = dict
-
 try:
     from rest_framework.serializers import ManyRelatedField
 except ImportError: