encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-04 20:40:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge 92c630ef24 into 3e8068757b

Browse Source
This commit is contained in:
Florian Demmer 2014-11-11 13:28:49 +00:00
commit 130311bfbe
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rest_framework/generics.py
View File

@ -69,15 +69,17 @@ class GenericAPIView(views.APIView):
# and should be considered private API.
paginator_class = Paginator
def get_serializer_context(self):
def get_serializer_context(self, **kwargs):
"""
Extra context provided to the serializer class.
"""
return {
context = {
'request': self.request,
'format': self.format_kwarg,
'view': self
}
context.update(**kwargs)
return context
def get_serializer(self, instance=None, data=None, many=False, partial=False):
"""