attempt at fixing the examples

5 files changed, 8 insertions, 7 deletions

diff --git a/djangorestframework/mixins.py b/djangorestframework/mixins.py
index 516a0f4b..43dce870 100644
--- a/djangorestframework/mixins.py
+++ b/djangorestframework/mixins.py
@@ -372,7 +372,7 @@ class ReadModelMixin(ModelMixin):
         except model.DoesNotExist:
             raise ImmediateResponse(status=status.HTTP_404_NOT_FOUND)
 
-        return self.model_instance
+        return Response(self.model_instance)
 
 
 class CreateModelMixin(ModelMixin):
@@ -428,7 +428,7 @@ class UpdateModelMixin(ModelMixin):
         # TODO: update on the url of a non-existing resource url doesn't work
         # correctly at the moment - will end up with a new url
         try:
-            self.model_instance = self.get_instance(*query_kwargs)
+            self.model_instance = self.get_instance(**query_kwargs)
 
             for (key, val) in self.CONTENT.items():
                 setattr(self.model_instance, key, val)
diff --git a/djangorestframework/renderers.py b/djangorestframework/renderers.py
index 4e8158aa..08022c7c 100644
--- a/djangorestframework/renderers.py
+++ b/djangorestframework/renderers.py
@@ -355,7 +355,7 @@ class DocumentingTemplateRenderer(BaseRenderer):
             'login_url': login_url,
             'logout_url': logout_url,
             'FORMAT_PARAM': self._FORMAT_QUERY_PARAM,
-            'METHOD_PARAM': getattr(self.view, '_METHOD_PARAM', None),
+            'METHOD_PARAM': getattr(self.view.request, '_METHOD_PARAM', None),
             'ADMIN_MEDIA_PREFIX': getattr(settings, 'ADMIN_MEDIA_PREFIX', None),
         })
 
diff --git a/djangorestframework/templates/renderer.html b/djangorestframework/templates/renderer.html
index e396a58f..8b5c77c7 100644
--- a/djangorestframework/templates/renderer.html
+++ b/djangorestframework/templates/renderer.html
@@ -41,7 +41,7 @@
 	    <h1>{{ name }}</h1>
 	    <p>{{ description }}</p>
 	    <div class='module'>
-	    <pre><b>{{ response.status }} {{ response.status_text }}</b>{% autoescape off %}
+	    <pre><b>{{ response.status_code }} {{ response.status_text }}</b>{% autoescape off %}
 {% for key, val in response.headers.items %}<b>{{ key }}:</b> {{ val|urlize_quoted_links }}
 {% endfor %}
 {{ content|urlize_quoted_links }}</pre>{% endautoescape %}</div>
@@ -63,7 +63,7 @@
 	{% endif %}
 
 	{# Only display the POST/PUT/DELETE forms if method tunneling via POST forms is enabled and the user has permissions on this view. #}
-	{% if METHOD_PARAM and response.status != 403 %}
+	{% if METHOD_PARAM and response.status_code != 403 %}
 
 		{% if 'POST' in view.allowed_methods %}
 				<form action="{{ request.get_full_path }}" method="post" {% if post_form.is_multipart %}enctype="multipart/form-data"{% endif %}>
diff --git a/djangorestframework/tests/mixins.py b/djangorestframework/tests/mixins.py
index 187ce719..3f5835aa 100644
--- a/djangorestframework/tests/mixins.py
+++ b/djangorestframework/tests/mixins.py
@@ -31,7 +31,7 @@ class TestModelRead(TestModelsTestCase):
         mixin.resource = GroupResource
 
         response = mixin.get(request, id=group.id)
-        self.assertEquals(group.name, response.name)
+        self.assertEquals(group.name, response.raw_content.name)
 
     def test_read_404(self):
         class GroupResource(ModelResource):
diff --git a/djangorestframework/tests/response.py b/djangorestframework/tests/response.py
index b8cc5c1b..95603680 100644
--- a/djangorestframework/tests/response.py
+++ b/djangorestframework/tests/response.py
@@ -139,7 +139,8 @@ class MockView(ResponseMixin, DjangoView):
 
     def get(self, request, **kwargs):
         response = Response(DUMMYCONTENT, status=DUMMYSTATUS)
-        return self.prepare_response(response)
+        self.response = self.prepare_response(response)
+        return self.response
 
 
 class HTMLView(View):