From 61f6fe2b8158c955000277915d2af2acffae0646 Mon Sep 17 00:00:00 2001 From: George Hickman Date: Thu, 21 Mar 2013 00:03:41 -0700 Subject: [PATCH] Check `use_etags` before trying to set ETag header --- rest_framework/mixins.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rest_framework/mixins.py b/rest_framework/mixins.py index 1290dffc5..ada821754 100644 --- a/rest_framework/mixins.py +++ b/rest_framework/mixins.py @@ -101,10 +101,11 @@ class RetrieveModelMixin(object): queryset = self.get_queryset() filtered_queryset = self.filter_queryset(queryset) self.object = self.get_object(filtered_queryset) - if self.use_etags: + headers = {} + if getattr(self, 'use_etags', False): if self.get_etag(self.object) == request.META.get('HTTP_IF_NONE_MATCH'): return Response(status=304) - headers = {'ETag': self.get_etag(self.object)} + headers.update({'ETag': self.get_etag(self.object)}) serializer = self.get_serializer(self.object) return Response(serializer.data, headers=headers)