Ticket #11352: object_list_404-2.diff

django/shortcuts/__init__.py

@@ -86 +47 @@
     except queryset.model.DoesNotExist:
         raise Http404('No %s matches the given query.' % queryset.model._meta.object_name)
 
+def get_object_or_none(klass, *args, **kwargs):
+    """
+    Uses get() to return an object, or returns an empty QuerySet 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 get() query.
+
+    Note: Like with get(), an MultipleObjectsReturned will be raised if more than one
+    object is found.
+    """
+    queryset = _get_queryset(klass)
+    try:
+        return queryset.get(*args, **kwargs)
+    except queryset.model.DoesNotExist:
+        return queryset.none()
+
 def get_list_or_404(klass, *args, **kwargs):
     """
     Uses filter() to return a list of objects, or raise a Http404 exception if
@@ -98 +75 @@
     obj_list = list(queryset.filter(*args, **kwargs))
     if not obj_list:
         raise Http404('No %s matches the given query.' % queryset.model._meta.object_name)
+    return obj_list
+
+def get_list_or_none(klass, *args, **kwargs):
+    """
+    Uses filter() to return a list of objects, or return an empty QuerySet 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:
+        return list(queryset.none())
     return obj_list
+ No newline at end of file