diff options
| author | Michael Elovskikh | 2013-02-22 18:50:09 +0600 |
|---|---|---|
| committer | Michael Elovskikh | 2013-02-22 18:50:09 +0600 |
| commit | aa95ccbab79d8270e60bec91c01808c912799ca7 (patch) | |
| tree | 53d6e2af27aba0ad749e4f664459e2ac1aa68cec /rest_framework/renderers.py | |
| parent | ef3303eb3702f365aeecb8296592cffa93c4afc7 (diff) | |
| download | django-rest-framework-aa95ccbab79d8270e60bec91c01808c912799ca7.tar.bz2 | |
Fixed UnicodeDecodeError on get_name and get_description methods
Diffstat (limited to 'rest_framework/renderers.py')
| -rw-r--r-- | rest_framework/renderers.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/rest_framework/renderers.py b/rest_framework/renderers.py index 637904c4..bc5d0ed5 100644 --- a/rest_framework/renderers.py +++ b/rest_framework/renderers.py @@ -14,6 +14,7 @@ import json from django import forms from django.http.multipartparser import parse_header from django.template import RequestContext, loader, Template +from django.utils.encoding import force_unicode from rest_framework.compat import yaml from rest_framework.exceptions import ConfigurationError from rest_framework.settings import api_settings @@ -405,13 +406,13 @@ class BrowsableAPIRenderer(BaseRenderer): try: return view.get_name() except AttributeError: - return view.__doc__ + return force_unicode(view.__doc__) def get_description(self, view): try: return view.get_description(html=True) except AttributeError: - return view.__doc__ + return force_unicode(view.__doc__) def render(self, data, accepted_media_type=None, renderer_context=None): """ |
