[svn] commit: r307 - in /branches/parkinglot/src/lib/cc/python: ISC/CC/Message.py test.py
BIND 10 source code commits
bind10-changes at lists.isc.org
Fri Nov 20 12:00:36 UTC 2009
Author: mgraff
Date: Fri Nov 20 12:00:36 2009
New Revision: 307
Log:
make a difference between binary and string data. This is mostly because strings are utf-8, while binary is, well, binary.
Modified:
branches/parkinglot/src/lib/cc/python/ISC/CC/Message.py
branches/parkinglot/src/lib/cc/python/test.py
Modified: branches/parkinglot/src/lib/cc/python/ISC/CC/Message.py
==============================================================================
--- branches/parkinglot/src/lib/cc/python/ISC/CC/Message.py (original)
+++ branches/parkinglot/src/lib/cc/python/ISC/CC/Message.py Fri Nov 20 12:00:36 2009
@@ -23,10 +23,11 @@
PROTOCOL_VERSION = 0x536b616e
-_ITEM_DATA = 0x01
+_ITEM_BLOB = 0x01
_ITEM_HASH = 0x02
_ITEM_LIST = 0x03
_ITEM_NULL = 0x04
+_ITEM_UTF8 = 0x08
_ITEM_MASK = 0x0f
_ITEM_LENGTH_32 = 0x00
@@ -44,7 +45,8 @@
"""Encode a single UTF-8 tag.
... wire_partial = Message._encode_tag('this')
"""
- return(struct.pack(">B", len(bytearray(tag, 'utf-8'))) + bytearray(tag, 'utf-8'))
+ binary = bytes(tag, 'utf-8')
+ return(struct.pack(">B", len(binary))) + binary
def _encode_length_and_type(data, datatype):
"""Helper method to handle the length encoding in one place."""
@@ -58,9 +60,13 @@
else:
return(struct.pack(">B I", datatype, length) + data)
-def _pack_string(item):
- """Pack a string (data) and its type/length prefix."""
- return (_encode_length_and_type(bytearray(item, 'utf-8'), _ITEM_DATA))
+def _pack_utf8(item):
+ """Pack a string (utf-8) and its type/length prefix."""
+ return (_encode_length_and_type(bytes(item, 'utf-8'), _ITEM_UTF8))
+
+def _pack_blob(item):
+ """Pack a blob (binary data) and its type/length prefix."""
+ return (_encode_length_and_type(item, _ITEM_BLOB))
def _pack_array(item):
"""Pack a list (array) and its type/length prefix."""
@@ -71,8 +77,12 @@
data = _encode_hash(item)
return (_encode_length_and_type(data, _ITEM_HASH))
-def _encode_string(item):
- """Encode a string. More or less identity."""
+def _encode_utf8(item):
+ """Encode a string (utf-8). More or less identity."""
+ return (item)
+
+def _encode_blob(item):
+ """Encode a blob (data). More or less identity."""
return (item)
def _pack_nil():
@@ -87,22 +97,21 @@
return (_pack_hash(item))
elif type(item) == list:
return (_pack_array(item))
- elif type(item) in (bytearray, bytes):
- return (_pack_string(item.decode()))
- else:
- return (_pack_string(str(item)))
+ elif type(item) in (bytes, bytearray):
+ return (_pack_blob(item))
+ else:
+ return (_pack_utf8(str(item)))
def _encode_array(item):
"""Encode an array, where each value is encoded recursively"""
- ret = bytearray()
+ ret = bytes()
for i in item:
ret += _encode_item(i)
return ret
def _encode_hash(item):
"""Encode a hash, where each value is encoded recursively"""
-
- ret = bytearray()
+ ret = bytes()
for key, value in item.items():
ret += _encode_tag(key)
ret += _encode_item(value)
@@ -159,8 +168,10 @@
item = data[0:length]
data = data[length:]
- if item_type == _ITEM_DATA:
- value = item.decode()
+ if item_type == _ITEM_BLOB:
+ value = item
+ elif item_type == _ITEM_UTF8:
+ value = str(item, 'utf-8')
elif item_type == _ITEM_HASH:
value = _decode_hash(item)
elif item_type == _ITEM_LIST:
Modified: branches/parkinglot/src/lib/cc/python/test.py
==============================================================================
--- branches/parkinglot/src/lib/cc/python/test.py (original)
+++ branches/parkinglot/src/lib/cc/python/test.py Fri Nov 20 12:00:36 2009
@@ -6,28 +6,37 @@
def test_to_wire_of_string(self):
wire = ISC.CC.Message.to_wire({ "simple" : "string" })
- self.assertEqual(wire, b'Skan\x06simple!\x06string')
+ self.assertEqual(wire, b'Skan\x06simple(\x06string')
def test_from_wire_of_string(self):
- wire = b'Skan\x06simple!\x06string'
+ wire = b'Skan\x06simple(\x06string'
decoded = ISC.CC.Message.from_wire(wire)
self.assertEqual(decoded["simple"], "string")
+ def test_to_wire_of_binary_string(self):
+ wire = ISC.CC.Message.to_wire({ "simple" : b'\x01\xff\x02\x85' })
+ self.assertEqual(wire, b'Skan\x06simple!\x04\x01\xff\x02\x85')
+
+ def test_from_wire_of_binary_string(self):
+ wire = b'Skan\x06simple!\x04\x01\xff\x02\x85'
+ decoded = ISC.CC.Message.from_wire(wire)
+ self.assertEqual(decoded["simple"], b'\x01\xff\x02\x85')
+
def test_to_wire_of_list(self):
wire = ISC.CC.Message.to_wire({ "simple" : [ "string" ] })
- self.assertEqual(wire, b'Skan\x06simple#\x08!\x06string')
+ self.assertEqual(wire, b'Skan\x06simple#\x08(\x06string')
def test_from_wire_of_list(self):
- wire = b'Skan\x06simple#\x08!\x06string'
+ wire = b'Skan\x06simple#\x08(\x06string'
decoded = ISC.CC.Message.from_wire(wire)
self.assertEqual(decoded["simple"], [ "string" ])
def test_to_wire_of_hash(self):
wire = ISC.CC.Message.to_wire({ "simple" : { "string" : 1 }})
- self.assertEqual(wire, b'Skan\x06simple"\n\x06string!\x011')
+ self.assertEqual(wire, b'Skan\x06simple"\n\x06string(\x011')
def test_from_wire_of_hash(self):
- wire = b'Skan\x06simple"\n\x06string!\x011'
+ wire = b'Skan\x06simple"\n\x06string(\x011'
decoded = ISC.CC.Message.from_wire(wire)
self.assertEqual(decoded["simple"], { "string" : '1' })
@@ -42,28 +51,28 @@
def test_to_wire_of_empty_string(self):
wire = ISC.CC.Message.to_wire({ "simple" : "" })
- self.assertEqual(wire, b'Skan\x06simple!\x00')
+ self.assertEqual(wire, b'Skan\x06simple(\x00')
def test_from_wire_of_empty_string(self):
- wire = b'Skan\x06simple!\x00'
+ wire = b'Skan\x06simple(\x00'
decoded = ISC.CC.Message.from_wire(wire)
self.assertEqual(decoded["simple"], "")
def test_to_wire_of_utf8_string(self):
wire = ISC.CC.Message.to_wire({ "simple" : "ã›ã‚“ã›ã„" })
- self.assertEqual(wire, b'Skan\x06simple!\x0c\xe3\x81\x9b\xe3\x82\x93\xe3\x81\x9b\xe3\x81\x84')
+ self.assertEqual(wire, b'Skan\x06simple(\x0c\xe3\x81\x9b\xe3\x82\x93\xe3\x81\x9b\xe3\x81\x84')
def test_from_wire_of_utf8_string(self):
- wire = b'Skan\x06simple!\x0c\xe3\x81\x9b\xe3\x82\x93\xe3\x81\x9b\xe3\x81\x84'
+ wire = b'Skan\x06simple(\x0c\xe3\x81\x9b\xe3\x82\x93\xe3\x81\x9b\xe3\x81\x84'
decoded = ISC.CC.Message.from_wire(wire)
self.assertEqual(decoded["simple"], "ã›ã‚“ã›ã„")
def test_to_wire_of_utf8_label(self):
wire = ISC.CC.Message.to_wire({ "ã›ã‚“ã›ã„" : "string" })
- self.assertEqual(wire, b'Skan\x0c\xe3\x81\x9b\xe3\x82\x93\xe3\x81\x9b\xe3\x81\x84!\x06string')
+ self.assertEqual(wire, b'Skan\x0c\xe3\x81\x9b\xe3\x82\x93\xe3\x81\x9b\xe3\x81\x84(\x06string')
def test_from_wire_of_utf8_label(self):
- wire = b'Skan\x0c\xe3\x81\x9b\xe3\x82\x93\xe3\x81\x9b\xe3\x81\x84!\x06string'
+ wire = b'Skan\x0c\xe3\x81\x9b\xe3\x82\x93\xe3\x81\x9b\xe3\x81\x84(\x06string'
decoded = ISC.CC.Message.from_wire(wire)
self.assertEqual(decoded["ã›ã‚“ã›ã„"], "string")
More information about the bind10-changes
mailing list