Merge c557d01793 into d88ae359b8

djangorestframework/mixins.py

@@ -3,6 +3,7 @@ The :mod:`mixins` module provides a set of reusable `mixin`
 classes that can be added to a `View`.
 """
 
+from collections import Callable
 from django.contrib.auth.models import AnonymousUser
 from django.core.paginator import Paginator
 from django.db.models.fields.related import ForeignKey
@@ -513,8 +514,10 @@ class ModelMixin(object):
         """
         Return the queryset for this view.
         """
-        return getattr(self.resource, 'queryset',
-                       self.resource.model.objects.all())
+        queryset = getattr(self.resource, 'queryset',
+                           self.resource.model.objects.all())
+        return queryset() if isinstance(queryset, Callable) else queryset
+
 
     def get_ordering(self):
         """