mongodb/mongo-python-driver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

support encoding/decoding binary w/ different subtypes

Browse Source
This commit is contained in:
Mike Dirolf 2009-02-02 10:08:01 -05:00
parent beb8e7def4
commit 6e7d0ff1ef
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pymongo/bson.py
View File

@ -198,14 +198,14 @@ def _get_array(data):
def _get_binary(data):
(length, data) = _get_int(data)
subtype = data[0]
subtype = ord(data[0])
data = data[1:]
if subtype != "\x02":
raise InvalidBSON("binary subtype %r is unsupported" % subtype)
(length2, data) = _get_int(data)
if length2 != length - 4:
raise InvalidBSON("invalid binary - lengths don't match!")
return (Binary(data[:length2]), data[length2:])
if subtype == 2:
(length2, data) = _get_int(data)
if length2 != length - 4:
raise InvalidBSON("invalid binary (st 2) - lengths don't match!")
length = length2
return (Binary(data[:length], subtype), data[length:])
def _get_oid(data):
oid = _shuffle_oid(data[:12])
@ -290,8 +290,10 @@ def _element_to_bson(key, value):
if isinstance(value, float):
return "\x01" + name + struct.pack("<d", value)
if isinstance(value, Binary):
length = len(value)
return "\x05" + name + struct.pack("<i", length + 4) + "\x02" + struct.pack("<i", length) + value
subtype = value.subtype()
if subtype == 2:
value = struct.pack("<i", len(value)) + value
return "\x05" + name + struct.pack("<i", len(value)) + chr(subtype) + value
if isinstance(value, Code):
cstring = _make_c_string(value, False)
length = struct.pack("<i", len(cstring))

4
test/test_bson.py
View File

@ -83,6 +83,8 @@ class TestBSON(unittest.TestCase):
"\x10\x00\x00\x00\x03\x6E\x6F\x6E\x65\x00\x05\x00\x00\x00\x00\x00")
self.assertEqual(BSON.from_dict({"test": Binary("test")}),
"\x18\x00\x00\x00\x05\x74\x65\x73\x74\x00\x08\x00\x00\x00\x02\x04\x00\x00\x00\x74\x65\x73\x74\x00")
self.assertEqual(BSON.from_dict({"test": Binary("test", 128)}),
"\x14\x00\x00\x00\x05\x74\x65\x73\x74\x00\x04\x00\x00\x00\x80\x74\x65\x73\x74\x00")
self.assertEqual(BSON.from_dict({"test": None}),
"\x0B\x00\x00\x00\x0A\x74\x65\x73\x74\x00\x00")
self.assertEqual(BSON.from_dict({"date": datetime.datetime(2007, 1, 8, 0, 30, 11)}),
@ -110,6 +112,8 @@ class TestBSON(unittest.TestCase):
helper({"false": False})
helper({"an array": [1, True, 3.8, u"world"]})
helper({"an object": {"test": u"something"}})
helper({"a binary": Binary("test", 100)})
helper({"another binary": Binary("test")})
helper(SON([(u'test dst', datetime.datetime(1993, 4, 4, 2))]))
def from_then_to_dict(dict):