Ticket #7840: get_list_or_404_r7997.patch

django/shortcuts/__init__.py

@@ -51 +51 @@
     """
     Uses filter() to return a list of objects, or raise a Http404 exception if
     the list is empty.
-
+    
     klass may be a Model, Manager, or QuerySet object. All other passed
     arguments and keyword arguments are used in the filter() query.
     """
-    queryset = _get_queryset(klass)
-    obj_list = list(queryset.filter(*args, **kwargs))
-    if not obj_list:
+    queryset = _get_queryset(klass).filter(*args, **kwargs)
+
+    class WrapperQuerySet (QuerySet) :
+        def __getitem__ (self, slice) :
+            r = super(WrapperQuerySet, self).__getitem__(slice)
+            if len(r) < 1 :
+                raise Http404('No %s matches the given query.' % self.model._meta.object_name)
+
+            return r
+
+    if queryset.count() < 1 :
         raise Http404('No %s matches the given query.' % queryset.model._meta.object_name)
-    return obj_list
+
+    queryset = queryset._clone(klass=WrapperQuerySet)
+    return queryset