diff options
| author | Tom Christie | 2012-08-24 16:06:23 +0100 |
|---|---|---|
| committer | Tom Christie | 2012-08-24 16:06:23 +0100 |
| commit | 7557777c668e6b8eaa85b07971b94115a33c9358 (patch) | |
| tree | 6bd152248eb1e535b86fbc4396fe16fa644a0d2f /djangorestframework/views.py | |
| parent | 2d2e2f95b0268c3282edfca5c047bdc831133016 (diff) | |
| parent | db7d15d5d136a9b4dcf759f9d588006244bd4e91 (diff) | |
| download | django-rest-framework-7557777c668e6b8eaa85b07971b94115a33c9358.tar.bz2 | |
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
Diffstat (limited to 'djangorestframework/views.py')
| -rw-r--r-- | djangorestframework/views.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/djangorestframework/views.py b/djangorestframework/views.py index 3657fd64..4aa6ca0c 100644 --- a/djangorestframework/views.py +++ b/djangorestframework/views.py @@ -156,6 +156,9 @@ class View(ResourceMixin, RequestMixin, ResponseMixin, AuthMixin, DjangoView): description = _remove_leading_indent(description) + if not isinstance(description, unicode): + description = description.decode('UTF-8') + if html: return self.markup_description(description) return description |