encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-02 11:30:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge ca40b03b93 into 0950d3e0ef

Browse Source
This commit is contained in:
Kirk Strauser 2013-07-04 00:59:54 -07:00
commit 6ab434d052
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
rest_framework/parsers.py
View File

@ -50,10 +50,7 @@ class JSONParser(BaseParser):
def parse(self, stream, media_type=None, parser_context=None): def parse(self, stream, media_type=None, parser_context=None):
""" """
Returns a 2-tuple of `(data, files)`. Returns a dict of parsed items.
`data` will be an object which is the parsed content of the response.
`files` will always be `None`.
""" """
parser_context = parser_context or {} parser_context = parser_context or {}
encoding = parser_context.get('encoding', settings.DEFAULT_CHARSET) encoding = parser_context.get('encoding', settings.DEFAULT_CHARSET)
@ -74,10 +71,7 @@ class YAMLParser(BaseParser):
def parse(self, stream, media_type=None, parser_context=None): def parse(self, stream, media_type=None, parser_context=None):
""" """
Returns a 2-tuple of `(data, files)`. Returns a dict of parsed items.
`data` will be an object which is the parsed content of the response.
`files` will always be `None`.
""" """
assert yaml, 'YAMLParser requires pyyaml to be installed' assert yaml, 'YAMLParser requires pyyaml to be installed'
@ -100,10 +94,7 @@ class FormParser(BaseParser):
def parse(self, stream, media_type=None, parser_context=None): def parse(self, stream, media_type=None, parser_context=None):
""" """
Returns a 2-tuple of `(data, files)`. Returns a dict of parsed items.
`data` will be a :class:`QueryDict` containing all the form parameters.
`files` will always be :const:`None`.
""" """
parser_context = parser_context or {} parser_context = parser_context or {}
encoding = parser_context.get('encoding', settings.DEFAULT_CHARSET) encoding = parser_context.get('encoding', settings.DEFAULT_CHARSET)
@ -147,6 +138,9 @@ class XMLParser(BaseParser):
media_type = 'application/xml' media_type = 'application/xml'
def parse(self, stream, media_type=None, parser_context=None): def parse(self, stream, media_type=None, parser_context=None):
"""
Returns a dict of parsed items.
"""
assert etree, 'XMLParser requires defusedxml to be installed' assert etree, 'XMLParser requires defusedxml to be installed'
parser_context = parser_context or {} parser_context = parser_context or {}