From d6e10b50fc6f1735d7dd6ee8bfd9d5d39b635b49 Mon Sep 17 00:00:00 2001
From: Jamie Matthews
Date: Thu, 25 Oct 2012 12:26:08 +0100
Subject: Re-add implementation of multiple-operation generic views to remove
 diamond inheritance

---
 rest_framework/generics.py | 35 ++++++++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/rest_framework/generics.py b/rest_framework/generics.py
index cfb3f29e..7a36f36a 100644
--- a/rest_framework/generics.py
+++ b/rest_framework/generics.py
@@ -144,23 +144,44 @@ class UpdateAPIView(mixins.UpdateModelMixin,
         return self.update(request, *args, **kwargs)
 
 
-class ListCreateAPIView(ListAPIView,
-                        CreateAPIView):
+class ListCreateAPIView(mixins.ListModelMixin,
+                        mixins.CreateModelMixin,
+                        MultipleObjectBaseView):
     """
     Concrete view for listing a queryset or creating a model instance.
     """
+    def get(self, request, *args, **kwargs):
+        return self.list(request, *args, **kwargs)
+
+    def post(self, request, *args, **kwargs):
+        return self.create(request, *args, **kwargs)
 
 
-class RetrieveDestroyAPIView(RetrieveAPIView,
-                             DestroyAPIView):
+class RetrieveDestroyAPIView(mixins.RetrieveModelMixin,
+                             mixins.DestroyModelMixin,
+                             SingleObjectBaseView):
     """
     Concrete view for retrieving or deleting a model instance.
     """
+    def get(self, request, *args, **kwargs):
+        return self.retrieve(request, *args, **kwargs)
+
+    def delete(self, request, *args, **kwargs):
+        return self.destroy(request, *args, **kwargs)
 
 
-class RetrieveUpdateDestroyAPIView(RetrieveAPIView,
-                                   UpdateAPIView,
-                                   DestroyAPIView):
+class RetrieveUpdateDestroyAPIView(mixins.RetrieveModelMixin,
+                                   mixins.UpdateModelMixin,
+                                   mixins.DestroyModelMixin,
+                                   SingleObjectBaseView):
     """
     Concrete view for retrieving, updating or deleting a model instance.
     """
+    def get(self, request, *args, **kwargs):
+        return self.retrieve(request, *args, **kwargs)
+
+    def put(self, request, *args, **kwargs):
+        return self.update(request, *args, **kwargs)
+
+    def delete(self, request, *args, **kwargs):
+        return self.destroy(request, *args, **kwargs)
-- 
cgit v1.2.3