fixed support of python3

jbzhur · jbzhur · commit 11a3b1561a07 · 2014-02-12T23:09:23.000+04:00
diff --git a/msgpack/fallback.py b/msgpack/fallback.py
@@ -194,7 +194,7 @@ def feed(self, next_bytes):
         if isinstance(next_bytes, array.array):
             next_bytes = next_bytes.tostring()
         elif isinstance(next_bytes, bytearray):
-            next_bytes = str(next_bytes)
+            next_bytes = (bytes if PY3 else str)(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,6 +2,7 @@
 # coding: utf-8
 
 from msgpack import packb, unpackb
+import sys
 
 
 def test_unpack_buffer():
@@ -16,5 +17,7 @@ def test_unpack_bytearray():
     buf = bytearray(packb(('foo', 'bar')))
     obj = unpackb(buf, use_list=1)
     assert [b'foo', b'bar'] == obj
-    assert all(type(s)==str for s in obj)
+    expected_type = bytes if sys.version_info[0] == 3 else str
+    assert all(type(s)==expected_type for s in obj)
+
 
