From deb19272b72f46c31f09651470a91ca46bb7dd2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Jaworski?= <swistakm@gmail.com>
Date: Wed, 3 Sep 2014 16:49:32 +0200
Subject: [PATCH 1/3] Add custom pagination test that covers case with custom
 object serializer class

---
 tests/test_pagination.py | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/tests/test_pagination.py b/tests/test_pagination.py
index 80c33e2eb..e1c2528b2 100644
--- a/tests/test_pagination.py
+++ b/tests/test_pagination.py
@@ -412,6 +412,15 @@ class CustomPaginationSerializer(pagination.BasePaginationSerializer):
     results_field = 'objects'
 
 
+class CustomFooSerializer(serializers.Serializer):
+    foo = serializers.CharField()
+
+
+class CustomFooPaginationSerializer(pagination.PaginationSerializer):
+    class Meta:
+        object_serializer_class = CustomFooSerializer
+
+
 class TestCustomPaginationSerializer(TestCase):
     def setUp(self):
         objects = ['john', 'paul', 'george', 'ringo']
@@ -434,6 +443,16 @@ class TestCustomPaginationSerializer(TestCase):
         }
         self.assertEqual(serializer.data, expected)
 
+    def test_custom_pagination_serializer_with_custom_object_serializer(self):
+        objects = [
+            {'foo': 'bar'},
+            {'foo': 'spam'}
+        ]
+        paginator = Paginator(objects, 1)
+        page = paginator.page(1)
+        serializer = CustomFooPaginationSerializer(page)
+        serializer.data
+
 
 class NonIntegerPage(object):
 

From 9195ccb97f608a48e39a277705fb197fe8c0d50c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Jaworski?= <swistakm@gmail.com>
Date: Wed, 3 Sep 2014 16:52:41 +0200
Subject: [PATCH 2/3] Use explicit many=True for object_serializer
 instantiation in PaginationSerializer and add catch dummy 'many' kwarg on
 DefaultObjectSerializer

---
 rest_framework/pagination.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py
index d51ea929b..9dce05b11 100644
--- a/rest_framework/pagination.py
+++ b/rest_framework/pagination.py
@@ -43,8 +43,9 @@ class DefaultObjectSerializer(serializers.Field):
     as the default.
     """
 
-    def __init__(self, source=None, context=None):
-        # Note: Swallow context kwarg - only required for eg. ModelSerializer.
+    def __init__(self, source=None, many=None, context=None):
+        # Note: Swallow context and many kwargs - only required for
+        # eg. ModelSerializer.
         super(DefaultObjectSerializer, self).__init__(source=source)
 
 
@@ -82,7 +83,10 @@ class BasePaginationSerializer(serializers.Serializer):
         else:
             context_kwarg = {}
 
-        self.fields[results_field] = object_serializer(source='object_list', **context_kwarg)
+        print object_serializer
+        self.fields[results_field] = object_serializer(source='object_list',
+                                                       many=True,
+                                                       **context_kwarg)
 
 
 class PaginationSerializer(BasePaginationSerializer):

From afe9b37f600ba7dad9de249f56ea1e7c539939f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Jaworski?= <swistakm@gmail.com>
Date: Wed, 3 Sep 2014 17:21:56 +0200
Subject: [PATCH 3/3] remove rogue print

---
 rest_framework/pagination.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py
index 9dce05b11..1f5749f1a 100644
--- a/rest_framework/pagination.py
+++ b/rest_framework/pagination.py
@@ -83,7 +83,6 @@ class BasePaginationSerializer(serializers.Serializer):
         else:
             context_kwarg = {}
 
-        print object_serializer
         self.fields[results_field] = object_serializer(source='object_list',
                                                        many=True,
                                                        **context_kwarg)