Merge 9ee8ce575b into e4144b5b67

rest_framework/generics.py

@@ -92,6 +92,7 @@ class GenericAPIView(views.APIView):
         """
         Return a serializer instance to use with paginated data.
         """
+        if self.pagination_serializer_class:
             class SerializerClass(self.pagination_serializer_class):
                 class Meta:
                     object_serializer_class = self.get_serializer_class()

rest_framework/mixins.py

@@ -90,7 +90,10 @@ class ListModelMixin(object):
         page = self.paginate_queryset(self.object_list)
         if page is not None:
             serializer = self.get_pagination_serializer(page)
-        else:
+
+            if serializer:
+                return Response(serializer.data)
+
         serializer = self.get_serializer(self.object_list, many=True)
 
         return Response(serializer.data)