From a748fdb5a1deab8371e26f42f84887a99d0cd92c Mon Sep 17 00:00:00 2001
From: Roman Zeyde <roman.zeyde@gmail.com>
Date: Wed, 6 Aug 2014 18:22:15 +0300
Subject: [PATCH] port stream and send

---
 amodem/send.py   | 9 +++++----
 amodem/stream.py | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/amodem/send.py b/amodem/send.py
index 6322224..3c9f255 100755
--- a/amodem/send.py
+++ b/amodem/send.py
@@ -18,8 +18,9 @@ modem = sigproc.MODEM(config)
 
 
 class Symbol(object):
-    t = np.arange(0, config.Nsym) * config.Ts
-    carrier = [np.exp(2j * np.pi * F * t) for F in modem.freqs]
+    def __init__(self):
+        t = np.arange(0, config.Nsym) * config.Ts
+        self.carrier = [np.exp(2j * np.pi * F * t) for F in modem.freqs]
 
 sym = Symbol()
 
@@ -31,7 +32,7 @@ class Writer(object):
 
     def write(self, fd, sym, n=1):
         data = common.dumps(sym, n)
-        fd.write(data)
+        fd.write(str(data))
         self.offset += len(data)
         if time.time() > self.last + 1:
             log.debug('%10.3f seconds of data audio',
@@ -69,7 +70,7 @@ class Reader(object):
         self.size = size
         self.total = 0
 
-    def next(self):
+    def __next__(self):
         block = self.fd.read(self.size)
         if block:
             self.total += len(block)
diff --git a/amodem/stream.py b/amodem/stream.py
index fc59b93..8b0c835 100644
--- a/amodem/stream.py
+++ b/amodem/stream.py
@@ -19,7 +19,7 @@ class Reader(object):
     def __iter__(self):
         return self
 
-    def next(self):
+    def __next__(self):
         block = bytearray()
         finish_time = time.time() + self.TIMEOUT
         while time.time() <= finish_time: