modified examples, somethin' still broken, can't find what

2 files changed, 5 insertions, 34 deletions

diff --git a/examples/requestexample/urls.py b/examples/requestexample/urls.py
index a5e3356a..3c31e4a9 100644
--- a/examples/requestexample/urls.py
+++ b/examples/requestexample/urls.py
@@ -1,5 +1,7 @@
 from django.conf.urls.defaults import patterns, url
-from requestexample.views import RequestExampleView, MockView, EchoRequestContentView
+from requestexample.views import RequestExampleView, EchoRequestContentView
+from examples.views import MockView
+
 
 urlpatterns = patterns('',
     url(r'^$', RequestExampleView.as_view(), name='request-example'),
diff --git a/examples/requestexample/views.py b/examples/requestexample/views.py
index 5411a323..876db864 100644
--- a/examples/requestexample/views.py
+++ b/examples/requestexample/views.py
@@ -5,6 +5,7 @@ from django.core.urlresolvers import reverse
 from djangorestframework.mixins import RequestMixin
 from djangorestframework.views import View as DRFView
 from djangorestframework import parsers
+from djangorestframework.response import Response
 
 
 class RequestExampleView(DRFView):
@@ -13,7 +14,7 @@ class RequestExampleView(DRFView):
     """
 
     def get(self, request):
-        return [{'name': 'request.DATA Example', 'url': reverse('request-content')},]
+        return Response([{'name': 'request.DATA Example', 'url': reverse('request-content')},])
 
 
 class MyBaseViewUsingEnhancedRequest(RequestMixin, View):
@@ -41,35 +42,3 @@ class EchoRequestContentView(MyBaseViewUsingEnhancedRequest):
         return HttpResponse(("Found %s in request.DATA, content : %s" %
             (type(request.DATA), request.DATA)))
 
-
-class MockView(DRFView):
-    """
-    A view that just acts as a proxy to call non-djangorestframework views, while still
-    displaying the browsable API interface.
-    """
-
-    view_class = None
-
-    def dispatch(self, request, *args, **kwargs):
-        self.request = request
-        if self.get_request().method in ['PUT', 'POST']:
-            self.response = self.view_class.as_view()(request, *args, **kwargs)
-        return super(MockView, self).dispatch(request, *args, **kwargs)
-
-    def get(self, request, *args, **kwargs):
-        return
-
-    def put(self, request, *args, **kwargs):
-        return self.response.content
-
-    def post(self, request, *args, **kwargs):
-        return self.response.content
-
-    def __getattribute__(self, name):
-        if name == '__name__':
-            return self.view_class.__name__
-        elif name == '__doc__':
-            return self.view_class.__doc__
-        else:
-            return super(MockView, self).__getattribute__(name)
-