Merge branch 'pr/82'

methane · methane · commit eb3537ab5090 · 2014-02-17T04:07:16.000+09:00
diff --git a/msgpack/fallback.py b/msgpack/fallback.py
@@ -193,6 +193,8 @@ def __init__(self, file_like=None, read_size=0, use_list=True,
     def feed(self, next_bytes):
         if isinstance(next_bytes, array.array):
             next_bytes = next_bytes.tostring()
+        elif isinstance(next_bytes, bytearray):
+            next_bytes = bytes(next_bytes)
         assert self._fb_feeding
         if self._fb_buf_n + len(next_bytes) > self._max_buffer_size:
             raise BufferFull
diff --git a/test/test_buffer.py b/test/test_buffer.py
@@ -2,12 +2,20 @@
 # coding: utf-8
 
 from msgpack import packb, unpackb
+import sys
 
 
 def test_unpack_buffer():
     from array import array
     buf = array('b')
-    buf.fromstring(packb(('foo', 'bar')))
+    buf.fromstring(packb((b'foo', b'bar')))
     obj = unpackb(buf, use_list=1)
     assert [b'foo', b'bar'] == obj
 
+
+def test_unpack_bytearray():
+    buf = bytearray(packb(('foo', 'bar')))
+    obj = unpackb(buf, use_list=1)
+    assert [b'foo', b'bar'] == obj
+    expected_type = bytes
+    assert all(type(s) == expected_type for s in obj)
