fix common.load()

common.py

@@ -33,9 +33,8 @@ def to_byte(bits):
     byte = int(np.dot(bits, bit_weights))
     return chr(byte)
 
-def load(fname):
+def load(fileobj):
-    data = open(fname, 'rb').read()
+    return loads(fileobj.read())
-    return loads(data)
 
 def loads(data):
     x = np.fromstring(data, dtype='int16')

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 = []

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')

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)