benya/whipper-gui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix dictionary iteration methods

Browse Source
This commit is contained in:
JoeLametta
2018-05-02 08:40:00 +00:00
parent b6ac79f01e
commit a484815106
6 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
whipper/image/table.py
View File

@@ -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)