diff options
| author | Tom Christie | 2013-08-19 07:40:30 +0100 |
|---|---|---|
| committer | Tom Christie | 2013-08-19 07:40:30 +0100 |
| commit | a8aabe23c94b1281ac8ca752a09555c1b0ef163d (patch) | |
| tree | afcf5191bb5d2107747c3f82a1801e2e602808c1 /rest_framework/renderers.py | |
| parent | c1ccd8b5b5aef1bd209862f9431c9c03e25ae755 (diff) | |
| parent | 5a374955b14e1f1fdc85f0fa68284dbf6b83ab5f (diff) | |
| download | django-rest-framework-a8aabe23c94b1281ac8ca752a09555c1b0ef163d.tar.bz2 | |
Merge branch 'master' of git://github.com/chrispaolini/django-rest-framework into chrispaolini-master
Diffstat (limited to 'rest_framework/renderers.py')
| -rw-r--r-- | rest_framework/renderers.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 3a03ca33..1006e26c 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -24,7 +24,6 @@ from rest_framework.settings import api_settings from rest_framework.request import clone_request from rest_framework.utils import encoders from rest_framework.utils.breadcrumbs import get_breadcrumbs -from rest_framework.utils.formatting import get_view_name, get_view_description from rest_framework import exceptions, parsers, status, VERSION @@ -498,10 +497,10 @@ class BrowsableAPIRenderer(BaseRenderer): return GenericContentForm() def get_name(self, view): - return get_view_name(view.__class__, getattr(view, 'suffix', None)) + return view.get_view_name() def get_description(self, view): - return get_view_description(view.__class__, html=True) + return view.get_view_description(html=True) def get_breadcrumbs(self, request): return get_breadcrumbs(request.path) |
