encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-07-23 22:49:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge 07cb610461 into 0824761f47

Browse Source
This commit is contained in:
David Henderson 2012-12-11 13:12:55 -08:00
commit 1acfd15b36
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rest_framework/request.py
View File

@ -75,12 +75,13 @@ class Request(object):
_CONTENTTYPE_PARAM = api_settings.FORM_CONTENTTYPE_OVERRIDE
def __init__(self, request, parsers=None, authenticators=None,
negotiator=None, parser_context=None):
negotiator=None, parser_context=None, kargs = {}):
self._request = request
self.parsers = parsers or ()
self.authenticators = authenticators or ()
self.negotiator = negotiator or self._default_negotiator()
self.parser_context = parser_context
self.kwargs = kargs
self._data = Empty
self._files = Empty
self._method = Empty

2
rest_framework/views.py
View File

@ -275,7 +275,7 @@ class APIView(View):
parsers=self.get_parsers(),
authenticators=self.get_authenticators(),
negotiator=self.get_content_negotiator(),
parser_context=parser_context)
parser_context=parser_context, kargs=kargs)
def initial(self, request, *args, **kwargs):
"""