From f4670c89969503919cd597529f19174e67acd388 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Thu, 20 Sep 2012 14:00:53 +0100 Subject: [PATCH] Hack out bunch of unneccesary private methods on View class --- rest_framework/mixins.py | 4 ++-- rest_framework/renderers.py | 7 ++++--- rest_framework/views.py | 35 ----------------------------------- 3 files changed, 6 insertions(+), 40 deletions(-) diff --git a/rest_framework/mixins.py b/rest_framework/mixins.py index 3dd4a0475..33a363d33 100644 --- a/rest_framework/mixins.py +++ b/rest_framework/mixins.py @@ -84,8 +84,8 @@ class MetadataMixin(object): content = { 'name': self.get_name(), 'description': self.get_description(), - 'renders': self._rendered_media_types, - 'parses': self._parsed_media_types, + 'renders': [renderer.media_type for renderer in self.renderer_classes], + 'parses': [parser.media_type for parser in self.parser_classes], } # TODO: Add 'fields', from serializer info. # form = self.get_bound_form() diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index a00ca0a5d..dd9228d84 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -261,8 +261,9 @@ class DocumentingTemplateRenderer(BaseRenderer): Add the fields dynamically.""" super(GenericContentForm, self).__init__() - contenttype_choices = [(media_type, media_type) for media_type in view._parsed_media_types] - initial_contenttype = view._default_parser.media_type + parsed_media_types = [parser.media_type for parser in view.parser_classes] + contenttype_choices = [(media_type, media_type) for media_type in parsed_media_types] + initial_contenttype = parsed_media_types[0] self.fields[request._CONTENTTYPE_PARAM] = forms.ChoiceField(label='Content Type', choices=contenttype_choices, @@ -320,7 +321,7 @@ class DocumentingTemplateRenderer(BaseRenderer): 'version': VERSION, 'breadcrumblist': breadcrumb_list, 'allowed_methods': self.view.allowed_methods, - 'available_formats': self.view._rendered_formats, + 'available_formats': [renderer.format for renderer in self.view.renderer_classes], 'put_form': put_form_instance, 'post_form': post_form_instance, 'FORMAT_PARAM': self._FORMAT_QUERY_PARAM, diff --git a/rest_framework/views.py b/rest_framework/views.py index 62be157da..a97101107 100644 --- a/rest_framework/views.py +++ b/rest_framework/views.py @@ -137,41 +137,6 @@ class APIView(_View): """ raise exceptions.Throttled(wait) - @property - def _parsed_media_types(self): - """ - Return a list of all the media types that this view can parse. - """ - return [parser.media_type for parser in self.parser_classes] - - @property - def _default_parser(self): - """ - Return the view's default parser class. - """ - return self.parser_classes[0] - - @property - def _rendered_media_types(self): - """ - Return an list of all the media types that this response can render. - """ - return [renderer.media_type for renderer in self.renderer_classes] - - @property - def _rendered_formats(self): - """ - Return a list of all the formats that this response can render. - """ - return [renderer.format for renderer in self.renderer_classes] - - @property - def _default_renderer(self): - """ - Return the response's default renderer class. - """ - return self.renderer_classes[0] - def get_format_suffix(self, **kwargs): """ Determine if the request includes a '.json' style format suffix