diff options
| author | Tom Christie | 2015-01-19 14:41:10 +0000 | 
|---|---|---|
| committer | Tom Christie | 2015-01-19 14:41:10 +0000 | 
| commit | 4f3c3a06cfc0ea2dfbf46da2d98546664343ce93 (patch) | |
| tree | 00a568097b5e34750f932aeec62fee4b19b048b5 /rest_framework/renderers.py | |
| parent | dc18040ba47325afb38ae62042a6103bfd794c4b (diff) | |
| download | django-rest-framework-4f3c3a06cfc0ea2dfbf46da2d98546664343ce93.tar.bz2 | |
Drop trailing whitespace on indented JSON output. Closes #2429.
Diffstat (limited to 'rest_framework/renderers.py')
| -rw-r--r-- | rest_framework/renderers.py | 8 | 
1 files changed, 6 insertions, 2 deletions
| diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 4c46b049..7af03c67 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -18,7 +18,7 @@ from django.template import Context, RequestContext, loader, Template  from django.test.client import encode_multipart  from django.utils import six  from rest_framework import exceptions, serializers, status, VERSION -from rest_framework.compat import SHORT_SEPARATORS, LONG_SEPARATORS +from rest_framework.compat import SHORT_SEPARATORS, LONG_SEPARATORS, INDENT_SEPARATORS  from rest_framework.exceptions import ParseError  from rest_framework.settings import api_settings  from rest_framework.request import is_form_media_type, override_method @@ -87,7 +87,11 @@ class JSONRenderer(BaseRenderer):          renderer_context = renderer_context or {}          indent = self.get_indent(accepted_media_type, renderer_context) -        separators = SHORT_SEPARATORS if (indent is None and self.compact) else LONG_SEPARATORS + +        if indent is None: +            separators = SHORT_SEPARATORS if self.compact else LONG_SEPARATORS +        else: +            separators = INDENT_SEPARATORS          ret = json.dumps(              data, cls=self.encoder_class, | 
