From a5571d13d05656adb6f353eefb6f494918a4e413 Mon Sep 17 00:00:00 2001
From: Roman Zeyde <roman.zeyde@gmail.com>
Date: Fri, 4 Jul 2014 18:33:12 +0300
Subject: [PATCH] fix common.load()

---
 common.py | 5 ++---
 drift.py  | 2 +-
 recv.py   | 2 +-
 show.py   | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/common.py b/common.py
index 6b27148..0525cba 100644
--- a/common.py
+++ b/common.py
@@ -33,9 +33,8 @@ def to_byte(bits):
     byte = int(np.dot(bits, bit_weights))
     return chr(byte)
 
-def load(fname):
-    data = open(fname, 'rb').read()
-    return loads(data)
+def load(fileobj):
+    return loads(fileobj.read())
 
 def loads(data):
     x = np.fromstring(data, dtype='int16')
diff --git a/drift.py b/drift.py
index 64eb602..2359bfe 100644
--- a/drift.py
+++ b/drift.py
@@ -28,7 +28,7 @@ import pylab
 
 def main():
     f0 = 10e3
-    _, x = common.load('recv_10kHz.pcm')
+    _, x = common.load(file('recv_10kHz.pcm', 'rb'))
     x = x[100:]
 
     S = []
diff --git a/recv.py b/recv.py
index 35582f7..c68ca73 100644
--- a/recv.py
+++ b/recv.py
@@ -128,7 +128,7 @@ def constellation(y):
 
 def main(fname):
 
-    _, x = load(fname)
+    _, x = load(open(fname, 'rb'))
     result = detect(x, Fc)
     if result is None:
         log.info('No carrier detected')
diff --git a/show.py b/show.py
index 5a5ed52..5f90e29 100644
--- a/show.py
+++ b/show.py
@@ -13,7 +13,7 @@ if __name__ == '__main__':
     import common
 
     for fname in sys.argv[1:]:
-        t, x = common.load(fname)
+        t, x = common.load(open(fname, 'rb'))
         pylab.figure()
         pylab.title(fname)
         spectrogram(t, x, common.Fs)