From 2b09cdaef26ea09e6c3814921aed0ec0106095d8 Mon Sep 17 00:00:00 2001 From: Morgan Aubert Date: Thu, 6 Apr 2017 10:40:48 -0400 Subject: [PATCH] Refactored total_count computation line --- wagtail/api/v2/pagination.py | 3 +-- wagtail/contrib/wagtailapi/pagination.py | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/wagtail/api/v2/pagination.py b/wagtail/api/v2/pagination.py index 3bfdac7e1..089d99547 100644 --- a/wagtail/api/v2/pagination.py +++ b/wagtail/api/v2/pagination.py @@ -36,8 +36,7 @@ class WagtailPagination(BasePagination): stop = offset + limit self.view = view - self.total_count = (queryset.count() if isinstance(queryset, QuerySet) or - isinstance(queryset, BaseSearchResults) else len(queryset)) + self.total_count = queryset.count() if isinstance(queryset, (BaseSearchResults, QuerySet)) else len(queryset) return queryset[start:stop] def get_paginated_response(self, data): diff --git a/wagtail/contrib/wagtailapi/pagination.py b/wagtail/contrib/wagtailapi/pagination.py index b8c72b4dc..4182a3f98 100644 --- a/wagtail/contrib/wagtailapi/pagination.py +++ b/wagtail/contrib/wagtailapi/pagination.py @@ -36,8 +36,7 @@ class WagtailPagination(BasePagination): stop = offset + limit self.view = view - self.total_count = (queryset.count() if isinstance(queryset, QuerySet) or - isinstance(queryset, BaseSearchResults) else len(queryset)) + self.total_count = queryset.count() if isinstance(queryset, (BaseSearchResults, QuerySet)) else len(queryset) return queryset[start:stop] def get_paginated_response(self, data):