gwsumm: fixed list/iter issues

gwsumm/plot/guardian.py

@@ -109,7 +109,7 @@ def draw(self):
             valid = SegmentList([self.span])
 
         # plot segments
-        for y, (flag, label) in enumerate(zip(self.flags, labels)[::-1]):
+        for y, (flag, label) in enumerate(list(zip(self.flags, labels))[::-1]):
             inreq = str(flag) + REQUESTSTUB
             nominal = str(flag) + NOMINALSTUB
             segs = get_segments([flag, inreq, nominal], validity=valid,

gwsumm/plot/segments.py

@@ -320,7 +320,7 @@ def draw(self):
 
         # plot segments
         for i, (flag, pargs) in enumerate(
-                zip(self.flags, plotargs)[::-1]):
+                list(zip(self.flags, plotargs))[::-1]):
             label = re_quote.sub('', pargs.pop('label', str(flag)))
             if (self.fileformat == 'svg' and not str(flag) in label and
                     ax.get_insetlabels()):
@@ -417,7 +417,7 @@ def _parse_labels(self, defaults=[]):
         to set the bit names from the various channels as the defaults
         in stead of the channel names
         """
-        chans = zip(*self.get_channel_groups())[0]
+        chans = list(zip(*self.get_channel_groups()))[0]
         labels = list(self.pargs.pop('labels', defaults))
         if isinstance(labels, string_types):
             labels = labels.split(',')
@@ -506,7 +506,7 @@ def draw(self):
                 labels = [labels]
             while len(labels) < len(flags):
                 labels.append(None)
-            for flag, label in zip(flags, labels)[::-1]:
+            for flag, label in list(zip(flags, labels))[::-1]:
                 kwargs = pargs.copy()
                 if label is not None:
                     kwargs['label'] = label

gwsumm/tabs/builtin.py

@@ -453,7 +453,7 @@ def scaffold_plots(self, plots=None, state=None, layout=None,
                 layout[i] = (l, None)
             else:
                 raise ValueError("Cannot parse layout element '%s'." % l)
-        while sum(zip(*layout)[0]) < len(plots):
+        while sum(list(zip(*layout))[0]) < len(plots):
             layout.append(layout[-1])
         l = i = 0
         fancyboxargs.setdefault('data-fancybox-group', 1)

gwsumm/tabs/fscan.py

@@ -207,7 +207,7 @@ def write_state_html(self, state):
             # reverse frequency order
             spectrograms = self.plots[::2]
             spectra = self.plots[1::2]
-            for pair in zip(spectrograms, spectra, freqs)[::-1]:
+            for pair in list(zip(spectrograms, spectra, freqs))[::-1]:
                 f = pair[-1]
                 page.div(class_='row', id="%s-%s" % (f[0], f[1]))
                 for p in pair[:2]: