Fixed #23555 -- Avoided suppressing IndexError in QuerySet.first() and .last()

1 files changed, 8 insertions, 10 deletions

diff --git a/django/db/models/query.py b/django/db/models/query.py
index be5892a371..9371aa14e0 100644
--- a/django/db/models/query.py
+++ b/django/db/models/query.py
@@ -516,21 +516,19 @@ class QuerySet(object):
         """
         Returns the first object of a query, returns None if no match is found.
         """
-        qs = self if self.ordered else self.order_by('pk')
-        try:
-            return qs[0]
-        except IndexError:
-            return None
+        objects = list((self if self.ordered else self.order_by('pk'))[:1])
+        if objects:
+            return objects[0]
+        return None
 
     def last(self):
         """
         Returns the last object of a query, returns None if no match is found.
         """
-        qs = self.reverse() if self.ordered else self.order_by('-pk')
-        try:
-            return qs[0]
-        except IndexError:
-            return None
+        objects = list((self.reverse() if self.ordered else self.order_by('-pk'))[:1])
+        if objects:
+            return objects[0]
+        return None
 
     def in_bulk(self, id_list):
         """