recv: remove re-buffering from decoded data.

amodem/framing.py

@@ -115,8 +115,7 @@ def _to_bytes(bits):
         yield [converter.to_byte[chunk]]
 
 
-@chain_wrapper
+def decode_frames(bits, framer=None):
-def decode(bits, framer=None):
     framer = framer or Framer()
     for frame in framer.decode(_to_bytes(bits)):
-        yield frame
+        yield bytes(frame)

amodem/recv.py

@@ -163,11 +163,9 @@ class Receiver(object):
         bitstream = self._demodulate(sampler, symbols)
         bitstream = itertools.chain.from_iterable(bitstream)
 
-        data = framing.decode(bitstream)
+        for frame in framing.decode_frames(bitstream):
-        chunks = common.iterate(data, size=16, truncate=False, func=bytearray)
+            output.write(frame)
-        for chunk in chunks:
+            self.output_size += len(frame)
-            output.write(bytes(chunk))
-            self.output_size += len(chunk)
 
     def report(self):
         if self.stats:

tests/test_framing.py

@@ -31,22 +31,22 @@ def test_framer(data):
 
 def test_main(data):
     encoded = framing.encode(data)
-    decoded = framing.decode(encoded)
+    decoded = framing.decode_frames(encoded)
-    assert bytearray(decoded) == data
+    assert concat(decoded) == data
 
 
 def test_fail():
     encoded = list(framing.encode(''))
     encoded[-1] = not encoded[-1]
     with pytest.raises(ValueError):
-        list(framing.decode(encoded))
+        concat(framing.decode_frames(encoded))
 
 
 def test_missing():
     f = framing.Framer()
     with pytest.raises(ValueError):
-        list(f.decode(b''))
+        concat(f.decode(b''))
     with pytest.raises(ValueError):
-        list(f.decode(b'\x01'))
+        concat(f.decode(b'\x01'))
     with pytest.raises(ValueError):
-        list(f.decode(b'\xff'))
+        concat(f.decode(b'\xff'))