Avoid listifying index pages when counting.

praekeltfoundation · Jul 8, 2015 · c8dc050 · c8dc050
1 parent a3f9a3d
commit c8dc050
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/go/base/management/commands/go_account_stats.py b/go/base/management/commands/go_account_stats.py
@@ -95,7 +95,7 @@ def handle_stats(self, user, api, options):
     def _count_results(self, index_page):
         count = 0
         while index_page is not None:
-            count += len(list(index_page))
+            count += len(index_page)
             index_page = index_page.next_page()
         return count
 

diff --git a/go/base/tests/test_go_manage_message_cache.py b/go/base/tests/test_go_manage_message_cache.py
@@ -33,7 +33,7 @@ def assert_batches_cleared(self, batches):
     def count_results(self, index_page):
         count = 0
         while index_page is not None:
-            count += len(list(index_page))
+            count += len(index_page)
             index_page = index_page.next_page()
         return count
 

diff --git a/go/contacts/views.py b/go/contacts/views.py
@@ -435,7 +435,7 @@ def _people(request):
     else:
         keys = contact_store.list_contacts_page(max_results=fetch_limit)
 
-    key_count = len(list(keys))
+    key_count = len(keys)
     limit = min(int(request.GET.get('limit', 100)), key_count)
     # If we have a continuation token, it means there are more than
     # `fetch_limit` keys.

diff --git a/go/vumitools/contact/tests/test_models.py b/go/vumitools/contact/tests/test_models.py
@@ -298,7 +298,7 @@ def test_get_static_contact_keys_for_group(self):
             contact_keys.add(contact.key)
 
         index_page = yield store.get_static_contact_keys_for_group(group)
-        self.assertEqual(len(list(index_page)), 2)
+        self.assertEqual(len(index_page), 2)
         self.assertEqual(index_page.has_next_page(), False)
 
     @inlineCallbacks
@@ -334,7 +334,7 @@ def test_get_contact_keys_for_group_static(self):
             contact_keys.add(contact.key)
 
         index_page = yield store.get_contact_keys_for_group(group)
-        self.assertEqual(len(list(index_page)), 2)
+        self.assertEqual(len(index_page), 2)
         self.assertEqual(index_page.has_next_page(), False)
 
     @inlineCallbacks

diff --git a/setup.py b/setup.py
@@ -12,7 +12,7 @@
     author_email='dev@praekeltfoundation.org',
     packages=find_packages(),
     install_requires=[
-        'vumi>=0.5.20',
+        'vumi>=0.5.21',
         'vxsandbox>=0.5.0',
         'vxpolls',
         'vumi-wikipedia>=0.2.1',