Merge 705af66015 into 0e0404ecb1

rest_framework/mixins.py

@@ -95,3 +95,14 @@ class DestroyModelMixin(object):
 
     def perform_destroy(self, instance):
         instance.delete()
+
+
+class MetadataModelMixin(object):
+    def metadata(self, request, *args, **kwargs):
+        """
+        Handler method for HTTP 'OPTIONS' request.
+        """
+        if self.metadata_class is None:
+            return self.http_method_not_allowed(request, *args, **kwargs)
+        data = self.metadata_class().determine_metadata(request, self)
+        return Response(data, status=status.HTTP_200_OK)

rest_framework/viewsets.py

@@ -148,6 +148,7 @@ class ModelViewSet(mixins.CreateModelMixin,
                    mixins.UpdateModelMixin,
                    mixins.DestroyModelMixin,
                    mixins.ListModelMixin,
+                   mixins.MetadataModelMixin,
                    GenericViewSet):
     """
     A viewset that provides default `create()`, `retrieve()`, `update()`,