attempt at fixing the examples

6 files changed, 13 insertions, 11 deletions

diff --git a/examples/mixin/urls.py b/examples/mixin/urls.py
index 6e9e497e..58cf370c 100644
--- a/examples/mixin/urls.py
+++ b/examples/mixin/urls.py
@@ -15,7 +15,8 @@ class ExampleView(ResponseMixin, View):
     def get(self, request):
         response = Response({'description': 'Some example content',
                                   'url': reverse('mixin-view')}, status=200)
-        return self.prepare_response(response)
+        self.response = self.prepare_response(response)
+        return self.response
 
 
 urlpatterns = patterns('',
diff --git a/examples/objectstore/views.py b/examples/objectstore/views.py
index 47f5147a..ae545394 100644
--- a/examples/objectstore/views.py
+++ b/examples/objectstore/views.py
@@ -67,7 +67,7 @@ class StoredObject(View):
         """
         pathname = os.path.join(OBJECT_STORE_DIR, key)
         if not os.path.exists(pathname):
-            return Response(status.HTTP_404_NOT_FOUND)
+            return Response(status=status.HTTP_404_NOT_FOUND)
         return Response(pickle.load(open(pathname, 'rb')))
 
     def put(self, request, key):
@@ -84,6 +84,6 @@ class StoredObject(View):
         """
         pathname = os.path.join(OBJECT_STORE_DIR, key)
         if not os.path.exists(pathname):
-            return Response(status.HTTP_404_NOT_FOUND)
+            return Response(status=status.HTTP_404_NOT_FOUND)
         os.remove(pathname)
         return Response()
diff --git a/examples/pygments_api/views.py b/examples/pygments_api/views.py
index 44dd2caa..d59a52c0 100644
--- a/examples/pygments_api/views.py
+++ b/examples/pygments_api/views.py
@@ -81,7 +81,8 @@ class PygmentsRoot(View):
 
         remove_oldest_files(HIGHLIGHTED_CODE_DIR, MAX_FILES)
 
-        return Response(status.HTTP_201_CREATED, headers={'Location': reverse('pygments-instance', args=[unique_id])})
+        self.headers['Location'] = reverse('pygments-instance', args=[unique_id])
+        return Response(status.HTTP_201_CREATED)
 
 
 class PygmentsInstance(View):
diff --git a/examples/requestexample/urls.py b/examples/requestexample/urls.py
index 3c31e4a9..d644a599 100644
--- a/examples/requestexample/urls.py
+++ b/examples/requestexample/urls.py
@@ -1,9 +1,9 @@
 from django.conf.urls.defaults import patterns, url
 from requestexample.views import RequestExampleView, EchoRequestContentView
-from examples.views import MockView
+from examples.views import ProxyView
 
 
 urlpatterns = patterns('',
     url(r'^$', RequestExampleView.as_view(), name='request-example'),
-    url(r'^content$', MockView.as_view(view_class=EchoRequestContentView), name='request-content'),
+    url(r'^content$', ProxyView.as_view(view_class=EchoRequestContentView), name='request-content'),
 )
diff --git a/examples/requestexample/views.py b/examples/requestexample/views.py
index 876db864..b5d2c1e7 100644
--- a/examples/requestexample/views.py
+++ b/examples/requestexample/views.py
@@ -25,7 +25,7 @@ class MyBaseViewUsingEnhancedRequest(RequestMixin, View):
     parser_classes = parsers.DEFAULT_PARSERS
 
     def dispatch(self, request, *args, **kwargs):
-        request = self.prepare_request(request)
+        self.request = request = self.create_request(request)
         return super(MyBaseViewUsingEnhancedRequest, self).dispatch(request, *args, **kwargs)
 
 
diff --git a/examples/views.py b/examples/views.py
index 606edc3a..e7ef2ec9 100644
--- a/examples/views.py
+++ b/examples/views.py
@@ -2,7 +2,7 @@ from djangorestframework.views import View
 from djangorestframework.response import Response
 
 
-class MockView(View):
+class ProxyView(View):
     """
     A view that just acts as a proxy to call non-djangorestframework views, while still
     displaying the browsable API interface.
@@ -11,10 +11,10 @@ class MockView(View):
     view_class = None
 
     def dispatch(self, request, *args, **kwargs):
-        request = self.prepare_request(request)
+        self.request = request = self.create_request(request)
         if request.method in ['PUT', 'POST']:
             self.response = self.view_class.as_view()(request, *args, **kwargs)
-        return super(MockView, self).dispatch(request, *args, **kwargs)
+        return super(ProxyView, self).dispatch(request, *args, **kwargs)
 
     def get(self, request, *args, **kwargs):
         return Response()
@@ -31,4 +31,4 @@ class MockView(View):
         elif name == '__doc__':
             return self.view_class.__doc__
         else:
-            return super(MockView, self).__getattribute__(name)
+            return super(ProxyView, self).__getattribute__(name)