From da4fa9bded9bbbbacf2a3009e1e211bdd51e287a Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Wed, 5 Sep 2012 09:54:46 +0100
Subject: Minor tweaks

---
 djangorestframework/views.py | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to 'djangorestframework/views.py')

diff --git a/djangorestframework/views.py b/djangorestframework/views.py
index 9796b362..5f967782 100644
--- a/djangorestframework/views.py
+++ b/djangorestframework/views.py
@@ -224,18 +224,19 @@ class APIView(_View):
 
     def initial(self, request, *args, **kargs):
         """
-        This method is a hook for any code that needs to run prior to
-        anything else.
-        Required if you want to do things like set `request.upload_handlers`
-        before the authentication and dispatch handling is run.
+        This method runs prior to anything else in the view.
+        It should return the initial request object.
+
+        You may need to override this if you want to do things like set
+        `request.upload_handlers` before the authentication and dispatch
+        handling is run.
         """
-        pass
+        return Request(request, parsers=self.parsers, authentication=self.authentication)
 
     def final(self, request, response, *args, **kargs):
         """
-        This method is a hook for any code that needs to run after everything
-        else in the view.
-        Returns the final response object.
+        This method runs after everything else in the view.
+        It should return the final response object.
         """
         if isinstance(response, Response):
             response.view = self
@@ -269,14 +270,12 @@ class APIView(_View):
     # all other authentication is CSRF exempt.
     @csrf_exempt
     def dispatch(self, request, *args, **kwargs):
-        request = Request(request, parsers=self.parsers, authentication=self.authentication)
-        self.request = request
         self.args = args
         self.kwargs = kwargs
         self.headers = self.default_response_headers
 
         try:
-            self.initial(request, *args, **kwargs)
+            self.request = self.initial(request, *args, **kwargs)
 
             # Check that the request is allowed
             self.check_permissions(request)
-- 
cgit v1.2.3