From a3e44fd372f380cae2b031799a27ff5405d0079b Mon Sep 17 00:00:00 2001 From: aswinm Date: Mon, 17 Oct 2016 21:45:28 +0530 Subject: [PATCH] Adding additional checks to getting the queryset --- rest_framework/routers.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/rest_framework/routers.py b/rest_framework/routers.py index 023ad42cb..ccc63836e 100644 --- a/rest_framework/routers.py +++ b/rest_framework/routers.py @@ -135,8 +135,14 @@ class SimpleRouter(BaseRouter): If `base_name` is not specified, attempt to automatically determine it from the viewset. """ - queryset = viewset().get_queryset() + if hasattr(viewset, 'get_queryset'): + queryset = viewset().get_queryset() + else: + queryset = getattr(viewset, 'queryset', None) + assert queryset is not None, '`base_name` argument not specified, and could ' \ + 'not automatically determine the name from the viewset, as ' \ + 'it does not have a `.queryset` attribute.' return queryset.model._meta.object_name.lower() def get_routes(self, viewset):