Fix dictionary iteration methods

whipper/command/accurip.py

@@ -74,7 +74,7 @@ retrieves and display accuraterip data from the given URL
 
             # now sort track results in checksum by highest confidence
             sortedChecksums = []
-            for checksum, entries in checksums.items():
+            for checksum, entries in list(checksums.items()):
                 highest = max(d['confidence'] for d in entries)
                 sortedChecksums.append((highest, checksum))
 

whipper/command/cd.py

@@ -222,7 +222,7 @@ Log files will log the path to tracks relative to this directory.
     # Requires opts.device
 
     def add_arguments(self):
-        loggers = result.getLoggers().keys()
+        loggers = list(result.getLoggers())
         default_offset = None
         info = drive.getDeviceInfo(self.opts.device)
         if info:

whipper/common/encode.py

@@ -83,7 +83,7 @@ class TaggingTask(task.Task):
     def _tag(self):
         w = FLAC(self.track_path)
 
-        for k, v in self.tags.items():
+        for k, v in list(self.tags.items()):
             w[k] = v
 
         w.save()

whipper/common/program.py

@@ -71,10 +71,10 @@ class Program:
 
         d = {}
 
-        for key, default in {
+        for key, default in list({
             'fat': True,
             'special': False
-        }.items():
+        }.items()):
             value = None
             value = self._config.getboolean('main', 'path_filter_' + key)
             if value is None:
@@ -375,7 +375,7 @@ class Program:
                                            releaseTitle, i,
                                            metadata.releaseTitle))
 
-                if (not release and len(deltas.keys()) > 1):
+                if (not release and len(list(deltas)) > 1):
                     self._stdout.write('\n')
                     self._stdout.write('Picked closest match in duration.\n')
                     self._stdout.write('Others may be wrong in MusicBrainz, '

whipper/image/table.py

@@ -107,12 +107,12 @@ class Track:
         Typically this is INDEX 01; but it could be INDEX 00 if there's
         a pre-gap.
         """
-        indexes = self.indexes.keys()
+        indexes = list(self.indexes.keys())
         indexes.sort()
         return self.indexes[indexes[0]]
 
     def getLastIndex(self):
-        indexes = self.indexes.keys()
+        indexes = list(self.indexes.keys())
         indexes.sort()
         return self.indexes[indexes[-1]]
 
@@ -543,7 +543,7 @@ class Table(object):
             if not track.audio:
                 continue
 
-            indexes = track.indexes.keys()
+            indexes = list(track.indexes.keys())
             indexes.sort()
 
             wroteTrack = False
@@ -724,7 +724,7 @@ class Table(object):
             t = copy.deepcopy(track)
             t.number = track.number + trackCount
             t.session = session
-            for i in t.indexes.values():
+            for i in list(t.indexes.values()):
                 if i.absolute is not None:
                     i.absolute += self.leadout + gap
                     logger.debug('Fixing track %02d, index %02d, '
@@ -768,7 +768,7 @@ class Table(object):
         @rtype: tuple of (int, int)
         """
         t = self.tracks[track - 1]
-        indexes = t.indexes.keys()
+        indexes = list(t.indexes)
         position = indexes.index(index)
 
         if position + 1 < len(indexes):
@@ -780,7 +780,7 @@ class Table(object):
                 track - 1, index))
 
         t = self.tracks[track - 1]
-        indexes = t.indexes.keys()
+        indexes = list(t.indexes)
 
         return track, indexes[0]
 
@@ -797,7 +797,7 @@ class Table(object):
             return False
 
         for t in self.tracks:
-            if 1 not in t.indexes.keys():
+            if 1 not in list(t.indexes):
                 logger.debug('no index 1, no TOC')
                 return False
             if t.indexes[1].absolute is None:
@@ -850,7 +850,7 @@ class Table(object):
             return False
 
         for t in self.tracks:
-            for i in t.indexes.values():
+            for i in list(t.indexes.values()):
                 if i.relative is None:
                     logger.debug('Track %02d, Index %02d does not '
                                  'have relative', t.number, i.number)

whipper/program/cdparanoia.py

@@ -161,7 +161,7 @@ class ProgressParser:
         # FIXME: doing this is way too slow even for a testcase, so disable
         if False:
             for frame in range(markStart, markEnd):
-                if frame not in self._reads.keys():
+                if frame not in list(self._reads.keys()):
                     self._reads[frame] = 0
                 self._reads[frame] += 1