Merge branch 'master' of https://github.com/tomchristie/django-rest-framework into #431

1 files changed, 9 insertions, 0 deletions

diff --git a/rest_framework/request.py b/rest_framework/request.py
index a1827ba4..39c64321 100644
--- a/rest_framework/request.py
+++ b/rest_framework/request.py
@@ -169,6 +169,15 @@ class Request(object):
             self._user, self._auth = self._authenticate()
         return self._user
 
+    @user.setter
+    def user(self, value):
+         """
+         Sets the user on the current request. This is necessary to maintain
+         compatilbility with django.contrib.auth where the user proprety is
+         set in the login and logout functions.
+         """
+         self._user = value
+
     @property
     def auth(self):
         """