Merge with master

1 files changed, 6 insertions, 6 deletions

diff --git a/examples/mixin/urls.py b/examples/mixin/urls.py
index 7a5697fd..900c532e 100644
--- a/examples/mixin/urls.py
+++ b/examples/mixin/urls.py
@@ -9,15 +9,15 @@ from django.conf.urls.defaults import patterns, url
 
 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."""
+    Uses djangorestframework's RendererMixin to provide support for multiple
+    output formats."""
     renderers = DEFAULT_RENDERERS
 
     def get(self, request):
-        url = reverse('mixin-view', request)
-        response = Response({'description': 'Some example content',
-                                  'url': url}, status=200)
-        self.response = self.prepare_response(response)
-        return self.response
+        url = reverse('mixin-view', request=request)
+        response = Response(200, {'description': 'Some example content',
+                                  'url': url})
+        return self.render(response)
 
 
 urlpatterns = patterns('',