From 939cc5adba6f5a95aac317134eb841838a0bff3f Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Thu, 9 May 2013 13:35:01 +0100
Subject: [PATCH] Tweak inheritance

---
 rest_framework/viewsets.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/rest_framework/viewsets.py b/rest_framework/viewsets.py
index 7c820091a..d91323f22 100644
--- a/rest_framework/viewsets.py
+++ b/rest_framework/viewsets.py
@@ -119,8 +119,7 @@ class GenericViewSet(ViewSetMixin, generics.GenericAPIView):
 
 class ReadOnlyModelViewSet(mixins.RetrieveModelMixin,
                            mixins.ListModelMixin,
-                           ViewSetMixin,
-                           generics.GenericAPIView):
+                           GenericViewSet):
     """
     A viewset that provides default `list()` and `retrieve()` actions.
     """
@@ -132,8 +131,7 @@ class ModelViewSet(mixins.CreateModelMixin,
                     mixins.UpdateModelMixin,
                     mixins.DestroyModelMixin,
                     mixins.ListModelMixin,
-                    ViewSetMixin,
-                    generics.GenericAPIView):
+                    GenericViewSet):
     """
     A viewset that provides default `create()`, `retrieve()`, `update()`,
     `partial_update()`, `destroy()` and `list()` actions.