Ticket #9222: callable_queryset.diff

django/views/generic/date_based.py

@@ -22 +22 @@
             Latest N (defaults to 15) objects by date
     """
     if extra_context is None: extra_context = {}
+    if callable(queryset):
+        queryset = queryset()
     model = queryset.model
     if not allow_future:
         queryset = queryset.filter(**{'%s__lte' % date_field: datetime.datetime.now()})
@@ -66 +68 @@
             (Only available if make_object_list argument is True)
     """
     if extra_context is None: extra_context = {}
+    if callable(queryset):
+        queryset = queryset()
     model = queryset.model
     now = datetime.datetime.now()
 
@@ -120 +124 @@
     except ValueError:
         raise Http404
 
+    if callable(queryset):
+        queryset = queryset()
     model = queryset.model
     now = datetime.datetime.now()
 
@@ -185 +191 @@
     except ValueError:
         raise Http404
 
+    if callable(queryset):
+        queryset = queryset()
     model = queryset.model
     now = datetime.datetime.now()
 
@@ -241 +249 @@
     except ValueError:
         raise Http404
 
+    if callable(queryset):
+        queryset = queryset()
     model = queryset.model
     now = datetime.datetime.now()
 
@@ -311 +321 @@
     except ValueError:
         raise Http404
 
+    if callable(queryset):
+        queryset = queryset()
     model = queryset.model
     now = datetime.datetime.now()
 

django/views/generic/list_detail.py

@@ -43 +43 @@
             A list of the page numbers (1-indexed).
     """
     if extra_context is None: extra_context = {}
-    queryset = queryset._clone()
+    if callable(queryset):
+        queryset = queryset()
+    else:
+        queryset = queryset._clone()
     if paginate_by:
         paginator = Paginator(queryset, paginate_by, allow_empty_first_page=allow_empty)
         if not page:
@@ -115 +118 @@
     """
     if extra_context is None: extra_context = {}
     model = queryset.model
+    if callable(queryset):
+        queryset = queryset()
     if object_id:
         queryset = queryset.filter(pk=object_id)
     elif slug and slug_field:

docs/ref/generic-views.txt

@@ -57 +57 @@
 ``year``, etc. do above) or from the additional-information dictionary (as for
 ``queryset``, ``date_field``, etc.).
 
-Most generic views require the ``queryset`` key, which is a ``QuerySet``
-instance; see :ref:`topics-db-queries` for more information about ``QuerySet``
-objects.
+Most generic views require the ``queryset`` key, which can be either a ``QuerySet``
+instance  or a callable object which returns a ``QuerySet``; see
+:ref:`topics-db-queries` for more information about ``QuerySet`` objects.
 
 Most views also take an optional ``extra_context`` dictionary that you can use
 to pass any auxiliary information you wish to the view. The values in the