From 9bb1277e512a88e6c11c52457d0c24e73f30bb98 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Tue, 9 Apr 2013 19:37:19 +0100
Subject: Cleaning up around bits of API that will be pending deprecation

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

(limited to 'rest_framework/viewsets.py')

diff --git a/rest_framework/viewsets.py b/rest_framework/viewsets.py
index 0818c0d9..28ab30e2 100644
--- a/rest_framework/viewsets.py
+++ b/rest_framework/viewsets.py
@@ -76,14 +76,12 @@ class ModelViewSet(mixins.CreateModelMixin,
                     mixins.DestroyModelMixin,
                     mixins.ListModelMixin,
                     ViewSetMixin,
-                    generics.MultipleObjectAPIView,
-                    generics.SingleObjectAPIView):
+                    generics.GenericAPIView):
     pass
 
 
 class ReadOnlyModelViewSet(mixins.RetrieveModelMixin,
                            mixins.ListModelMixin,
                            ViewSetMixin,
-                           generics.MultipleObjectAPIView,
-                           generics.SingleObjectAPIView):
+                           generics.GenericAPIView):
     pass
-- 
cgit v1.2.3