diff options
| author | Jamie Matthews | 2012-09-11 14:17:26 +0100 |
|---|---|---|
| committer | Jamie Matthews | 2012-09-11 14:20:35 +0100 |
| commit | 272c49685c8823068492ec9fadb7f982001244d7 (patch) | |
| tree | d3281dcb19809125ec94d8c419facc2b1a7ae69e /djangorestframework/response.py | |
| parent | d4f8b4cf0683923fe85652f8fd572d2931eb3074 (diff) | |
| download | django-rest-framework-272c49685c8823068492ec9fadb7f982001244d7.tar.bz2 | |
Better naming for properties on views, requests and responses
renderers is now renderer_classes
parsers is now parser_classes
authentication is now authentication_classes
Diffstat (limited to 'djangorestframework/response.py')
| -rw-r--r-- | djangorestframework/response.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/djangorestframework/response.py b/djangorestframework/response.py index 08e14199..e1366bdb 100644 --- a/djangorestframework/response.py +++ b/djangorestframework/response.py @@ -35,14 +35,14 @@ class Response(SimpleTemplateResponse): - content(object). The raw content, not yet serialized. This must be native Python data that renderers can handle. (e.g.: `dict`, `str`, ...) - - renderers(list/tuple). The renderers to use for rendering the response content. + - renderer_classes(list/tuple). The renderers to use for rendering the response content. """ _ACCEPT_QUERY_PARAM = api_settings.URL_ACCEPT_OVERRIDE _IGNORE_IE_ACCEPT_HEADER = True def __init__(self, content=None, status=None, headers=None, view=None, - request=None, renderers=None, format=None): + request=None, renderer_classes=None, format=None): # First argument taken by `SimpleTemplateResponse.__init__` is template_name, # which we don't need super(Response, self).__init__(None, status=status) @@ -52,17 +52,17 @@ class Response(SimpleTemplateResponse): self.headers = headers and headers[:] or [] self.view = view self.request = request - self.renderers = renderers + self.renderer_classes = renderer_classes self.format = format def get_renderers(self): """ Instantiates and returns the list of renderers the response will use. """ - if self.renderers is None: + if self.renderer_classes is None: renderer_classes = api_settings.DEFAULT_RENDERERS else: - renderer_classes = self.renderers + renderer_classes = self.renderer_classes if self.format: return [cls(self.view) for cls in renderer_classes @@ -133,7 +133,7 @@ class Response(SimpleTemplateResponse): def _determine_renderer(self): """ Determines the appropriate renderer for the output, given the list of - accepted media types, and the :attr:`renderers` set on this class. + accepted media types, and the :attr:`renderer_classes` set on this class. Returns a 2-tuple of `(renderer, media_type)` @@ -162,12 +162,12 @@ class Response(SimpleTemplateResponse): raise NotAcceptable def _get_406_response(self): - renderer = self.renderers[0] + renderer = self.renderer_classes[0] return Response( { 'detail': 'Could not satisfy the client\'s Accept header', 'available_types': [renderer.media_type - for renderer in self.renderers] + for renderer in self.renderer_classes] }, status=status.HTTP_406_NOT_ACCEPTABLE, - view=self.view, request=self.request, renderers=[renderer]) + view=self.view, request=self.request, renderer_classes=[renderer]) |
