aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/renderers.py
diff options
context:
space:
mode:
authorTom Christie2012-10-10 12:32:23 +0100
committerTom Christie2012-10-10 12:32:23 +0100
commitdb6b5a990b98cd0a6530b1bbf97f62c61b616fc0 (patch)
treed4f3cc59bfbc817c661f36f90f5cb9a4f9e84ecb /rest_framework/renderers.py
parent648d2be29b0738999742f4d844caab7b7652d1ad (diff)
downloaddjango-rest-framework-db6b5a990b98cd0a6530b1bbf97f62c61b616fc0.tar.bz2
Fix key ordering in json. (sort if it's a sorted dictc representation, or not otherwise)
Diffstat (limited to 'rest_framework/renderers.py')
-rw-r--r--rest_framework/renderers.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py
index 27a85ab1..91cf16bb 100644
--- a/rest_framework/renderers.py
+++ b/rest_framework/renderers.py
@@ -54,7 +54,6 @@ class JSONRenderer(BaseRenderer):
# E.g. If we're being called by the BrowseableAPIRenderer.
renderer_context = renderer_context or {}
indent = renderer_context.get('indent', None)
- sort_keys = indent and True or False
if accepted_media_type:
# If the media type looks like 'application/json; indent=4',
@@ -63,12 +62,10 @@ class JSONRenderer(BaseRenderer):
indent = params.get('indent', indent)
try:
indent = max(min(int(indent), 8), 0)
- sort_keys = True
except (ValueError, TypeError):
indent = None
- return json.dumps(data, cls=self.encoder_class,
- indent=indent, sort_keys=sort_keys)
+ return json.dumps(data, cls=self.encoder_class, indent=indent)
class JSONPRenderer(JSONRenderer):