Merge pull request #2331 from tomchristie/use-custom-list-serializer-for-pagination

tomchristie · tomchristie · commit e4c7c10b0083 · 2014-12-20T16:42:39.000Z
Use custom ListSerializer for pagination if required.
diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py
@@ -68,7 +68,12 @@ def __init__(self, *args, **kwargs):
         except AttributeError:
             object_serializer = DefaultObjectSerializer
 
-        self.fields[results_field] = serializers.ListSerializer(
+        try:
+            list_serializer_class = object_serializer.Meta.list_serializer_class
+        except AttributeError:
+            list_serializer_class = serializers.ListSerializer
+
+        self.fields[results_field] = list_serializer_class(
             child=object_serializer(),
             source='object_list'
         )
