summaryrefslogtreecommitdiff
path: root/msgpack/fallback.py
diff options
context:
space:
mode:
authorINADA Naoki <inada-n@klab.com>2013-10-20 15:40:20 +0900
committerINADA Naoki <inada-n@klab.com>2013-10-20 15:40:20 +0900
commitaa68c9b8330b130d600b22ec47d5c3841499b536 (patch)
tree85fd0c30d69180b2afa1602b40bb4775ddf12459 /msgpack/fallback.py
parent27f0cba8a5f36393517ee85d2c339847b76e0c6b (diff)
downloadmsgpack-python-aa68c9b8330b130d600b22ec47d5c3841499b536.tar.gz
fallback: Support pack_ext_type.
Diffstat (limited to 'msgpack/fallback.py')
-rw-r--r--msgpack/fallback.py46
1 files changed, 39 insertions, 7 deletions
diff --git a/msgpack/fallback.py b/msgpack/fallback.py
index dfaaa54..0b29700 100644
--- a/msgpack/fallback.py
+++ b/msgpack/fallback.py
@@ -42,11 +42,11 @@ else:
newlist_hint = lambda size: []
from msgpack.exceptions import (
- BufferFull,
- OutOfData,
- UnpackValueError,
- PackValueError,
- ExtraData)
+ BufferFull,
+ OutOfData,
+ UnpackValueError,
+ PackValueError,
+ ExtraData)
from msgpack import ExtType
@@ -65,6 +65,7 @@ TYPE_EXT = 5
DEFAULT_RECURSE_LIMIT = 511
+
def unpack(stream, **kwargs):
"""
Unpack an object from `stream`.
@@ -78,6 +79,7 @@ def unpack(stream, **kwargs):
raise ExtraData(ret, unpacker._fb_get_extradata())
return ret
+
def unpackb(packed, **kwargs):
"""
Unpack an object from `packed`.
@@ -95,6 +97,7 @@ def unpackb(packed, **kwargs):
raise ExtraData(ret, unpacker._fb_get_extradata())
return ret
+
class Unpacker(object):
"""
Streaming unpacker.
@@ -548,8 +551,8 @@ class Packer(object):
if isinstance(obj, Unicode):
if self._encoding is None:
raise TypeError(
- "Can't encode unicode string: "
- "no encoding is specified")
+ "Can't encode unicode string: "
+ "no encoding is specified")
obj = obj.encode(self._encoding, self._unicode_errors)
n = len(obj)
if n <= 0x1f:
@@ -616,6 +619,35 @@ class Packer(object):
self._buffer = StringIO(ret)
return ret
+ def pack_ext_type(self, typecode, data):
+ if not isinstance(typecode, int):
+ raise TypeError("typecode must have int type.")
+ if not 0 <= typecode <= 127:
+ raise ValueError("typecode should be 0-127")
+ if not isinstance(data, bytes):
+ raise TypeError("data must have bytes type")
+ L = len(data)
+ if L > 0xffffffff:
+ raise ValueError("Too large data")
+ if L == 1:
+ self._buffer.write(b'\xd4')
+ elif L == 2:
+ self._buffer.write(b'\xd5')
+ elif L == 4:
+ self._buffer.write(b'\xd6')
+ elif L == 8:
+ self._buffer.write(b'\xd7')
+ elif L == 16:
+ self._buffer.write(b'\xd8')
+ elif L <= 0xff:
+ self._buffer.write(b'\xc7' + struct.pack('B', L))
+ elif L <= 0xffff:
+ self._buffer.write(b'\xc8' + struct.pack('>H', L))
+ else:
+ self._buffer.write(b'\xc9' + struct.pack('>I', L))
+ self._buffer.write(struct.pack('B', typecode))
+ self._buffer.write(data)
+
def _fb_pack_array_header(self, n):
if n <= 0x0f:
return self._buffer.write(struct.pack('B', 0x90 + n))