From bceca2364a9fc5e5c11a62e769c28335a322d309 Mon Sep 17 00:00:00 2001 From: George Hickman Date: Wed, 20 Mar 2013 23:14:27 -0700 Subject: [PATCH] Switch to a view level setting for using etags * Check for existance of `use_etags` as a precondition. * Set etag_header irregardless of the HTTP_IF_MATCH header state. --- rest_framework/views.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/rest_framework/views.py b/rest_framework/views.py index 9e2a0208a..98c7dcc64 100644 --- a/rest_framework/views.py +++ b/rest_framework/views.py @@ -398,12 +398,10 @@ class APIView(View): else: handler = self.http_method_not_allowed - if self.use_etags and request.method.lower() in ('put', 'delete'): - etag_header = request.META.get('HTTP_IF_MATCH') - if etag_header is None: - return Response({'error': 'IF_MATCH header is required'}, status=400) - else: - self.etag_header = etag_header + if getattr(self, 'use_etags', False) and request.method.lower() in ('put', 'delete'): + self.etag_header = request.META.get('HTTP_IF_MATCH') + if self.etag_header is None: + return Response({'detail': 'IF_MATCH header is required'}, status=400, exception=True) response = handler(request, *args, **kwargs)