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 89fa0d53cc into d2286ba658

Browse Source
This commit is contained in:
Sérgio Basto 2017-08-21 16:06:54 +00:00 committed by GitHub
commit 07ffec7fd0
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
rest_framework/renderers.py
View File

@ -99,10 +99,17 @@ class JSONRenderer(BaseRenderer):
else: else:
separators = INDENT_SEPARATORS separators = INDENT_SEPARATORS
ret = json.dumps( if type(data) is dict:
data, cls=self.encoder_class, ret = json.dumps(
indent=indent, ensure_ascii=self.ensure_ascii, data, cls=self.encoder_class,
separators=separators indent=indent, ensure_ascii=self.ensure_ascii,
separators=separators, sort_keys=True
)
else:
ret = json.dumps(
data, cls=self.encoder_class,
indent=indent, ensure_ascii=self.ensure_ascii,
separators=separators
) )
# On python 2.x json.dumps() returns bytestrings if ensure_ascii=True, # On python 2.x json.dumps() returns bytestrings if ensure_ascii=True,