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

Merge 1123bf1011 into 8f6173cd8a

Browse Source
This commit is contained in:
Alexandre Figura 2017-04-24 15:06:45 +00:00 committed by GitHub
commit bd6033ea00
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rest_framework/parsers.py
View File

@ -51,6 +51,7 @@ class JSONParser(BaseParser):
Parses JSON-serialized data. Parses JSON-serialized data.
""" """
media_type = 'application/json' media_type = 'application/json'
decoder_class = json.JSONDecoder
renderer_class = renderers.JSONRenderer renderer_class = renderers.JSONRenderer
def parse(self, stream, media_type=None, parser_context=None): def parse(self, stream, media_type=None, parser_context=None):
@ -62,7 +63,7 @@ class JSONParser(BaseParser):
try: try:
data = stream.read().decode(encoding) data = stream.read().decode(encoding)
return json.loads(data) return json.loads(data, cls=self.decoder_class)
except ValueError as exc: except ValueError as exc:
raise ParseError('JSON parse error - %s' % six.text_type(exc)) raise ParseError('JSON parse error - %s' % six.text_type(exc))