1 files changed, 6 insertions, 3 deletions
diff --git a/rest_framework/request.py b/rest_framework/request.py
index 4f9345f3..d508f9b4 100644
--- a/rest_framework/request.py
+++ b/rest_framework/request.py
@@ -46,13 +46,16 @@ class override_method(object):
 
     def __enter__(self):
         self.view.request = clone_request(self.request, self.method)
-        action_map = getattr(self.view, 'action_map', {})
-        self.view.action = action_map.get(self.method.lower())
+        if self.action is not None:
+            # For viewsets we also set the `.action` attribute.
+            action_map = getattr(self.view, 'action_map', {})
+            self.view.action = action_map.get(self.method.lower())
         return self.view.request
 
     def __exit__(self, *args, **kwarg):
-        self.view.action = self.action
         self.view.request = self.request
+        if self.action is not None:
+            self.view.action = self.action
 
 
 class Empty(object):