Skip to content

Fix zip usage for compatibility with python 3 #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mxmpl wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix zip usage for compatibility with python 3 #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions abkhazia/corpus/corpus_filter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ def __init__(self, corpus, log=logger.null_logger(),
self.corpus = corpus

# read utt2spk from the input corpus
utt_ids, utt_speakers = zip(*self.corpus.utt2spk.items())
self.utts = zip(utt_ids, utt_speakers)
utt_ids, utt_speakers = list(zip(*self.corpus.utt2spk.items()))
self.utts = list(zip(utt_ids, utt_speakers))
self.size = len(utt_ids)
self.speakers = set(utt_speakers)
self.limits = dict()
Expand Down Expand Up @@ -180,9 +180,9 @@ def filter_corpus(self, names, function, limits):
# create lists of utterances we want to keep,
# utterances we don't want to keep
for speaker in names:
utt_and_dur = zip(spk2utts[speaker],
utt_and_dur = list(zip(spk2utts[speaker],
[utt2dur[utt] for utt
in spk2utts[speaker]])
in spk2utts[speaker]]))
decreasing_utts = sorted(utt_and_dur,
key=lambda utt_and_dur: utt_and_dur[1],
reverse=True)
Expand Down
4 changes: 2 additions & 2 deletions abkhazia/corpus/corpus_merge_wavs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ def __init__(self, corpus, log=logger.null_logger()):
self.log = log
self.corpus = corpus
# read utt2spk from the input corpus
utt_ids, utt_speakers = zip(*self.corpus.utt2spk.items())
self.utts = zip(utt_ids, utt_speakers)
utt_ids, utt_speakers = list(zip(*self.corpus.utt2spk.items()))
self.utts = list(zip(utt_ids, utt_speakers))
self.size = len(utt_ids)
self.speakers = set(utt_speakers)
self.segments = self.corpus.segments
Expand Down
2 changes: 1 addition & 1 deletion abkhazia/corpus/corpus_split.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def __init__(self, corpus, log=logger.null_logger(),
random.seed(random_seed)

# read utt2spk from the input corpus
utt_ids, utt_speakers = zip(*self.corpus.utt2spk.items())
utt_ids, utt_speakers = list(zip(*self.corpus.utt2spk.items()))
self.utts = list(zip(utt_ids, utt_speakers))
self.size = len(utt_ids)
self.speakers = set(utt_speakers)
Expand Down
4 changes: 2 additions & 2 deletions abkhazia/corpus/corpus_trimmer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ def __init__(self, corpus, log=logger.null_logger()):
self.log = log
self.corpus = corpus

utt_ids, utt_speakers = zip(*self.corpus.utt2spk.items())
self.utts = zip(utt_ids, utt_speakers)
utt_ids, utt_speakers = list(zip(*self.corpus.utt2spk.items()))
self.utts = list(zip(utt_ids, utt_speakers))
self.speakers = set(utt_speakers)

def trim(self, corpus_dir, output_dir, function, not_kept_utts):
Expand Down
2 changes: 1 addition & 1 deletion abkhazia/corpus/prepare/globalphone_abstract_preparator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ def list_audio_files(self):
wavs = [
os.path.basename(shn).replace('.adc.shn', '.wav') for shn in shns]

return zip(shns, wavs)
return list(zip(shns, wavs))

def make_segment(self):
segments = dict()
Expand Down
2 changes: 1 addition & 1 deletion abkhazia/corpus/prepare/librispeech_preparator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ def list_audio_files(self):
wavs.append(prefix + utt_id + '.wav')

self._wavs = wavs
return zip(flacs, wavs)
return list(zip(flacs, wavs))

def make_segment(self):
segments = dict()
Expand Down
2 changes: 1 addition & 1 deletion abkhazia/corpus/prepare/xitsonga_preparator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ def list_audio_files(self):
self._wavs = [os.path.basename(wav).replace('nchlt_tso_', '')
for wav in inputs]

return zip(inputs, self._wavs)
return list(zip(inputs, self._wavs))

def make_segment(self):
segments = dict()
Expand Down