Merge branch 'dev'

Author: willforde

script.module.codequick/lib/codequick/route.py

@@ -46,7 +46,7 @@ def validate_listitems(raw_listitems):
         # Check that we have valid list of listitems
         if isinstance(raw_listitems, (list, tuple)):
             # Check for an explicite False return value
-            return False if len(raw_listitems) == 1 and raw_listitems[0] is False else filter(None, raw_listitems)
+            return False if len(raw_listitems) == 1 and raw_listitems[0] is False else list(filter(None, raw_listitems))
         else:
             raise ValueError("Unexpected return object: {}".format(type(raw_listitems)))
     else:

tests/test_search.py

@@ -49,7 +49,7 @@ def results(_, search_query):
         session_id = hash_params(params)
 
         with testing.mock_keyboard("Rock"):
-            listitems = list(search.saved_searches.test(first_load=True, execute_delayed=True, **params))
+            listitems = search.saved_searches.test(first_load=True, execute_delayed=True, **params)
 
         with storage.PersistentDict(search.SEARCH_DB) as db:
             self.assertIn(session_id, db)
@@ -70,8 +70,6 @@ def results(_, search_query):
 
         with testing.mock_keyboard("Rock"):
             listitems = search.saved_searches.test(first_load=True, execute_delayed=True, **params)
-            if not isinstance(listitems, bool):
-                listitems = list(listitems)
 
         with storage.PersistentDict(search.SEARCH_DB) as db:
             self.assertIn(session_id, db)
@@ -90,8 +88,6 @@ def results(_, search_query):
 
         with testing.mock_keyboard(""):
             listitems = search.saved_searches.test(first_load=True, execute_delayed=True, **params)
-            if not isinstance(listitems, bool):
-                listitems = list(listitems)
 
         with storage.PersistentDict(search.SEARCH_DB) as db:
             self.assertIn(session_id, db)
@@ -111,8 +107,6 @@ def results(_, search_query):
 
         with testing.mock_keyboard("Rock"):
             listitems = search.saved_searches.test(search=True, execute_delayed=True, **params)
-            if not isinstance(listitems, bool):
-                listitems = list(listitems)
 
         with storage.PersistentDict(search.SEARCH_DB) as db:
             self.assertIn(session_id, db)
@@ -138,7 +132,7 @@ def results(_, search_query):
             db.flush()
 
         with testing.mock_keyboard("Rock"):
-            listitems = list(search.saved_searches.test(search=True, execute_delayed=True, **params))
+            listitems = search.saved_searches.test(search=True, execute_delayed=True, **params)
 
         with storage.PersistentDict(search.SEARCH_DB) as db:
             self.assertIn(session_id, db)
@@ -164,7 +158,7 @@ def results(_, search_query):
             db.flush()
 
         with testing.mock_keyboard(""):
-            listitems = list(search.saved_searches.test(search=True, execute_delayed=True, **params))
+            listitems = search.saved_searches.test(search=True, execute_delayed=True, **params)
 
         with storage.PersistentDict(search.SEARCH_DB) as db:
             self.assertIn(session_id, db)