From fd061199140d976871b6d63c0d13d0c9862ae24b Mon Sep 17 00:00:00 2001 From: Marc Tamlyn Date: Fri, 4 Jan 2013 21:30:37 +0000 Subject: [PATCH] Pass through Serializer initialization kwargs. (from PaginationSerializer to the corresponding ObjectSerializer) --- rest_framework/pagination.py | 3 ++- rest_framework/tests/pagination.py | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py index d241ade7c..999ce4fce 100644 --- a/rest_framework/pagination.py +++ b/rest_framework/pagination.py @@ -62,7 +62,8 @@ class BasePaginationSerializer(serializers.Serializer): super(BasePaginationSerializer, self).__init__(*args, **kwargs) results_field = self.results_field object_serializer = self.opts.object_serializer_class - self.fields[results_field] = object_serializer(source='object_list') + kwargs['source'] = 'object_list' + self.fields[results_field] = object_serializer(*args, **kwargs) def to_native(self, obj): """ diff --git a/rest_framework/tests/pagination.py b/rest_framework/tests/pagination.py index 81d297a1f..c37fbdfbc 100644 --- a/rest_framework/tests/pagination.py +++ b/rest_framework/tests/pagination.py @@ -181,8 +181,7 @@ class UnitTestPagination(TestCase): """ Ensure context gets passed through to the object serializer. """ - serializer = PassOnContextPaginationSerializer(self.first_page) - serializer.data + serializer = PassOnContextPaginationSerializer(self.first_page, context={'foo': 'bar'}) results = serializer.fields[serializer.results_field] self.assertTrue(serializer.context is results.context)