Merge remote-tracking branch 'crccheck/there-is-no-try'

armstrong · May 17, 2012 · 61f03e4 · 61f03e4
2 parents bf24bb4 + c5488b1
commit 61f03e4
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/armstrong/core/arm_wells/managers.py b/armstrong/core/arm_wells/managers.py
@@ -5,11 +5,6 @@
 class WellManager(models.Manager):
     def get_current(self, title):
         now = datetime.datetime.now()
-        queryset = self.filter(type__title=title, pub_date__lte=now,
+        return self.filter(type__title=title, pub_date__lte=now,
                 active=True).exclude(expires__lte=now,
-                        expires__isnull=False).order_by('-pub_date')
-
-        try:
-            return queryset[0]
-        except IndexError:
-            raise self.model.DoesNotExist
+                        expires__isnull=False).latest('pub_date')