From 8409940caedfb1ecc5e43476a632a576c6fe07f7 Mon Sep 17 00:00:00 2001
From: Roman Zeyde <roman.zeyde@gmail.com>
Date: Thu, 28 Aug 2014 16:50:01 +0300
Subject: [PATCH] remove Python 2/3 import hack

---
 amodem/common.py | 6 ------
 amodem/recv.py   | 8 +++++++-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/amodem/common.py b/amodem/common.py
index 66ec00a..b1b7702 100644
--- a/amodem/common.py
+++ b/amodem/common.py
@@ -102,12 +102,6 @@ def take(iterable, n):
     return np.array(list(itertools.islice(iterable, n)))
 
 
-try:
-    izip = itertools.izip
-except AttributeError:
-    izip = zip  # Python 3
-
-
 class Dummy(object):
 
     def __getattr__(self, name):
diff --git a/amodem/recv.py b/amodem/recv.py
index c3d665f..59c7784 100644
--- a/amodem/recv.py
+++ b/amodem/recv.py
@@ -163,6 +163,12 @@ def train_receiver(sampler, order, lookahead):
 stats = {}
 
 
+def izip(streams):
+    iters = [iter(s) for s in streams]
+    while True:
+        yield [next(i) for i in iters]
+
+
 def demodulate(sampler, freqs):
     streams = []
     symbol_list = []
@@ -187,7 +193,7 @@ def demodulate(sampler, freqs):
     stats['rx_start'] = time.time()
 
     log.info('Demodulation started')
-    for i, block in enumerate(common.izip(*streams)):  # block per frequency
+    for i, block in enumerate(izip(streams)):  # block per frequency
         for bits in block:
             stats['rx_bits'] = stats['rx_bits'] + len(bits)
             yield bits