Add bin type support for fallback Unpacker.

Author: methane

msgpack/__init__.py

@@ -10,7 +10,7 @@
         from msgpack._packer import Packer
         from msgpack._unpacker import unpack, unpackb, Unpacker
     except ImportError:
-        from msgpack.fallback import pack, packb, Packer, unpack, unpackb, Unpacker
+        from msgpack.fallback import Packer, unpack, unpackb, Unpacker
 
 
 def pack(o, stream, **kwargs):

msgpack/_unpacker.pyx

@@ -18,7 +18,6 @@ from msgpack.exceptions import (
         )
 
 
-
 cdef extern from "unpack.h":
     ctypedef struct msgpack_user:
         bint use_list

msgpack/fallback.py

@@ -57,6 +57,7 @@ def getvalue(self):
 TYPE_ARRAY              = 1
 TYPE_MAP                = 2
 TYPE_RAW                = 3
+TYPE_BIN                = 4
 
 DEFAULT_RECURSE_LIMIT=511
 
@@ -297,6 +298,10 @@ def _read_header(self, execute=EX_CONSTRUCT, write_bytes=None):
             obj = struct.unpack(">i", self._fb_read(4, write_bytes))[0]
         elif b == 0xd3:
             obj = struct.unpack(">q", self._fb_read(8, write_bytes))[0]
+        elif b == 0xd9:
+            n = struct.unpack("B", self._fb_read(1, write_bytes))[0]
+            obj = self._fb_read(n, write_bytes)
+            typ = TYPE_RAW
         elif b == 0xda:
             n = struct.unpack(">H", self._fb_read(2, write_bytes))[0]
             obj = self._fb_read(n, write_bytes)
@@ -305,6 +310,18 @@ def _read_header(self, execute=EX_CONSTRUCT, write_bytes=None):
             n = struct.unpack(">I", self._fb_read(4, write_bytes))[0]
             obj = self._fb_read(n, write_bytes)
             typ = TYPE_RAW
+        elif b == 0xc4:
+            n = struct.unpack("B", self._fb_read(1, write_bytes))[0]
+            obj = self._fb_read(n, write_bytes)
+            typ = TYPE_BIN
+        elif b == 0xc5:
+            n = struct.unpack(">H", self._fb_read(2, write_bytes))[0]
+            obj = self._fb_read(n, write_bytes)
+            typ = TYPE_BIN
+        elif b == 0xc6:
+            n = struct.unpack(">I", self._fb_read(4, write_bytes))[0]
+            obj = self._fb_read(n, write_bytes)
+            typ = TYPE_BIN
         elif b == 0xdc:
             n = struct.unpack(">H", self._fb_read(2, write_bytes))[0]
             typ = TYPE_ARRAY
@@ -373,6 +390,8 @@ def _fb_unpack(self, execute=EX_CONSTRUCT, write_bytes=None):
             if self._encoding is not None:
                 obj = obj.decode(self._encoding, self._unicode_errors)
             return obj
+        if typ == TYPE_BIN:
+            return obj
         assert typ == TYPE_IMMEDIATE
         return obj