Ticket #18087: 18087.patch

django/views/generic/dates.py

@@ -194 +194 @@
         if not allow_future:
             qs = qs.filter(**{'%s__lte' % date_field: timezone.now()})
 
-        if not allow_empty and not qs:
-            raise Http404(_(u"No %(verbose_name_plural)s available") % {
-                    'verbose_name_plural': force_unicode(qs.model._meta.verbose_name_plural)
-            })
+        if not allow_empty:
+            # When pagination is enabled, it's better to do a cheap query
+            # than to load the unpaginated queryset in memory.
+            is_empty = not bool(qs) if paginate_by is None else not qs.exists()
+            if is_empty:
+                raise Http404(_(u"No %(verbose_name_plural)s available") % {
+                        'verbose_name_plural': force_unicode(qs.model._meta.verbose_name_plural)
+                })
 
         return qs