aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/pagination.py
diff options
context:
space:
mode:
authorTom Christie2012-12-14 20:11:37 +0000
committerTom Christie2012-12-14 20:11:37 +0000
commit3c31222a415d5454cb458fc397c50ad848db1584 (patch)
tree29d0cc979c501aba650b22b60fd8390eba2b9733 /rest_framework/pagination.py
parente9eb47207a7e599c09d9eda4e2f9adfe03ef4542 (diff)
parent5f08ec70e24ee3bdf74eed62def2fd9108af0eb0 (diff)
downloaddjango-rest-framework-3c31222a415d5454cb458fc397c50ad848db1584.tar.bz2
Merge branch 'master' of https://github.com/sunscrapers/django-rest-framework
Diffstat (limited to 'rest_framework/pagination.py')
-rw-r--r--rest_framework/pagination.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py
index d241ade7..7d7bb647 100644
--- a/rest_framework/pagination.py
+++ b/rest_framework/pagination.py
@@ -62,7 +62,7 @@ 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')
+ self.fields[results_field] = object_serializer(source='object_list', **kwargs)
def to_native(self, obj):
"""