[cache] CachedDataSource is now an iterable class update its use

beat/cmdline/cache.py

@@ -113,12 +113,7 @@ def info(config, paths, sizes, index_start, index_end):
       counter = 0
       logger.info('  index:')
 
-      while f.hasMoreData():
-        try:
-          data, start, end = f.next()
-        except Exception as e:
-          logger.error("Failed to retrieve the next data: %s", e)
-          return 1
+      for data, start, end in f:
 
         size = len(data.pack())
         counter += size
@@ -154,14 +149,7 @@ def view(config, paths, index_start, index_end):
 
     logger.info('  dataformat: %s', f.dataformat.name)
 
-    while f.hasMoreData():
-
-      try:
-        data, start, end = f.next()
-      except Exception as e:
-        logger.error("Failed to retrieve the next data: %s", e)
-        return 1
-
+    for data, start, end in f:
       logger.extra(80 * '-')
 
       if start == end: