aboutsummaryrefslogtreecommitdiffstats
path: root/djangorestframework/mixins.py
diff options
context:
space:
mode:
authorTom Christie2011-05-10 12:21:48 +0100
committerTom Christie2011-05-10 12:21:48 +0100
commit527e4ffdf7f7798dc17757a26d8fd6b155a49bf9 (patch)
tree8a7811d692c136e78dd3ad64a6219d30f501d194 /djangorestframework/mixins.py
parent8f58ee489d34b200acfc2666816eb32e47c8cef5 (diff)
downloaddjango-rest-framework-527e4ffdf7f7798dc17757a26d8fd6b155a49bf9.tar.bz2
renderer API work
Diffstat (limited to 'djangorestframework/mixins.py')
-rw-r--r--djangorestframework/mixins.py20
1 files changed, 11 insertions, 9 deletions
diff --git a/djangorestframework/mixins.py b/djangorestframework/mixins.py
index 297d3f8d..0a45ef08 100644
--- a/djangorestframework/mixins.py
+++ b/djangorestframework/mixins.py
@@ -17,14 +17,16 @@ import re
from StringIO import StringIO
-__all__ = ('RequestMixin',
- 'ResponseMixin',
- 'AuthMixin',
- 'ReadModelMixin',
- 'CreateModelMixin',
- 'UpdateModelMixin',
- 'DeleteModelMixin',
- 'ListModelMixin')
+__all__ = (
+ 'RequestMixin',
+ 'ResponseMixin',
+ 'AuthMixin',
+ 'ReadModelMixin',
+ 'CreateModelMixin',
+ 'UpdateModelMixin',
+ 'DeleteModelMixin',
+ 'ListModelMixin'
+)
########## Request Mixin ##########
@@ -267,7 +269,7 @@ class ResponseMixin(object):
# Serialize the response content
if response.has_content_body:
- content = renderer(self).render(output=response.cleaned_content)
+ content = renderer(self).render(response.cleaned_content, renderer.media_type)
else:
content = renderer(self).render()