From ed38dc2b2be41ca292591b993ad565edb98aa8dc Mon Sep 17 00:00:00 2001
From: mxmpl <44207491+mxmpl@users.noreply.github.com>
Date: Tue, 15 Nov 2022 11:15:23 +0100
Subject: [PATCH] handle zip in python 3

---
 abkhazia/corpus/corpus_filter.py                          | 8 ++++----
 abkhazia/corpus/corpus_merge_wavs.py                      | 4 ++--
 abkhazia/corpus/corpus_split.py                           | 2 +-
 abkhazia/corpus/corpus_trimmer.py                         | 4 ++--
 .../corpus/prepare/globalphone_abstract_preparator.py     | 2 +-
 abkhazia/corpus/prepare/librispeech_preparator.py         | 2 +-
 abkhazia/corpus/prepare/xitsonga_preparator.py            | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/abkhazia/corpus/corpus_filter.py b/abkhazia/corpus/corpus_filter.py
index 65d69c9..844f8e0 100644
--- a/abkhazia/corpus/corpus_filter.py
+++ b/abkhazia/corpus/corpus_filter.py
@@ -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()
@@ -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)
diff --git a/abkhazia/corpus/corpus_merge_wavs.py b/abkhazia/corpus/corpus_merge_wavs.py
index ccefcd7..d5ded5e 100644
--- a/abkhazia/corpus/corpus_merge_wavs.py
+++ b/abkhazia/corpus/corpus_merge_wavs.py
@@ -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
diff --git a/abkhazia/corpus/corpus_split.py b/abkhazia/corpus/corpus_split.py
index 499cad0..a28e32e 100644
--- a/abkhazia/corpus/corpus_split.py
+++ b/abkhazia/corpus/corpus_split.py
@@ -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)
diff --git a/abkhazia/corpus/corpus_trimmer.py b/abkhazia/corpus/corpus_trimmer.py
index 543479d..b8464f8 100644
--- a/abkhazia/corpus/corpus_trimmer.py
+++ b/abkhazia/corpus/corpus_trimmer.py
@@ -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):
diff --git a/abkhazia/corpus/prepare/globalphone_abstract_preparator.py b/abkhazia/corpus/prepare/globalphone_abstract_preparator.py
index b0f9dfe..7cf7103 100644
--- a/abkhazia/corpus/prepare/globalphone_abstract_preparator.py
+++ b/abkhazia/corpus/prepare/globalphone_abstract_preparator.py
@@ -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()
diff --git a/abkhazia/corpus/prepare/librispeech_preparator.py b/abkhazia/corpus/prepare/librispeech_preparator.py
index 361a407..220150c 100755
--- a/abkhazia/corpus/prepare/librispeech_preparator.py
+++ b/abkhazia/corpus/prepare/librispeech_preparator.py
@@ -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()
diff --git a/abkhazia/corpus/prepare/xitsonga_preparator.py b/abkhazia/corpus/prepare/xitsonga_preparator.py
index 5e1ada8..65e7f86 100755
--- a/abkhazia/corpus/prepare/xitsonga_preparator.py
+++ b/abkhazia/corpus/prepare/xitsonga_preparator.py
@@ -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()