diff options
| author | Tom Christie | 2012-10-10 12:15:18 +0100 | 
|---|---|---|
| committer | Tom Christie | 2012-10-10 12:15:18 +0100 | 
| commit | 648d2be29b0738999742f4d844caab7b7652d1ad (patch) | |
| tree | aa4b8a630231f06477e2356abcfee80d54d2c8d8 /rest_framework/response.py | |
| parent | ccd2b0117d9c26199b1862a302b1eb06dd2f07b2 (diff) | |
| download | django-rest-framework-648d2be29b0738999742f4d844caab7b7652d1ad.tar.bz2 | |
Make sure JSON output in Browseable API is nicely indented
Diffstat (limited to 'rest_framework/response.py')
| -rw-r--r-- | rest_framework/response.py | 18 | 
1 files changed, 10 insertions, 8 deletions
| diff --git a/rest_framework/response.py b/rest_framework/response.py index 9a633a8a..7a459c8f 100644 --- a/rest_framework/response.py +++ b/rest_framework/response.py @@ -24,17 +24,17 @@ class Response(SimpleTemplateResponse):      @property      def rendered_content(self): -        renderer = self.accepted_renderer -        media_type = self.accepted_media_type +        renderer = getattr(self, 'accepted_renderer', None) +        media_type = getattr(self, 'accepted_media_type', None) +        context = getattr(self, 'renderer_context', None) -        assert renderer, "No accepted renderer set on Response" -        assert media_type, "No accepted media type set on Response" +        assert renderer, ".accepted_renderer not set on Response" +        assert media_type, ".accepted_media_type not set on Response" +        assert context, ".renderer_context not set on Response" +        context['response'] = self          self['Content-Type'] = media_type -        if self.data is None: -            return renderer.render() - -        return renderer.render(self.data, media_type) +        return renderer.render(self.data, media_type, context)      @property      def status_text(self): @@ -42,4 +42,6 @@ class Response(SimpleTemplateResponse):          Returns reason text corresponding to our HTTP response status code.          Provided for convenience.          """ +        # TODO: Deprecate and use a template tag instead +        # TODO: Status code text for RFC 6585 status codes          return STATUS_CODE_TEXT.get(self.status_code, '') | 
