Merge git://github.com/sebpiq/django-rest-framework into develop

1 files changed, 5 insertions, 4 deletions

diff --git a/examples/mixin/urls.py b/examples/mixin/urls.py
index a3da3b2c..58cf370c 100644
--- a/examples/mixin/urls.py
+++ b/examples/mixin/urls.py
@@ -10,12 +10,13 @@ from django.core.urlresolvers import reverse
 class ExampleView(ResponseMixin, View):
     """An example view using Django 1.3's class based views.
     Uses djangorestframework's RendererMixin to provide support for multiple output formats."""
-    renderers = DEFAULT_RENDERERS
+    renderer_classes = DEFAULT_RENDERERS
 
     def get(self, request):
-        response = Response(200, {'description': 'Some example content',
-                                  'url': reverse('mixin-view')})
-        return self.render(response)
+        response = Response({'description': 'Some example content',
+                                  'url': reverse('mixin-view')}, status=200)
+        self.response = self.prepare_response(response)
+        return self.response
 
 
 urlpatterns = patterns('',