From a804d0bd75ab812e4f8b96a356c2d42f422ac657 Mon Sep 17 00:00:00 2001 From: Alex Rothberg Date: Wed, 13 May 2015 22:53:32 -0400 Subject: [PATCH] set the action when override_method regardless of its None-ness --- rest_framework/request.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/rest_framework/request.py b/rest_framework/request.py index e4b5bc263..174a9de56 100644 --- a/rest_framework/request.py +++ b/rest_framework/request.py @@ -48,16 +48,14 @@ class override_method(object): def __enter__(self): self.view.request = clone_request(self.request, self.method) - 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()) + # 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.request = self.request - if self.action is not None: - self.view.action = self.action + self.view.action = self.action class Empty(object):