passing actual bytearrays, using unhexlify

Brendan Whitfield · Brendan Whitfield · commit 7952a5c4bf81 · 2016-01-24T14:38:43.000-05:00
diff --git a/obd/OBDCommand.py b/obd/OBDCommand.py
@@ -105,7 +105,7 @@ def __constrain_message_data(self, message):
                 message.data = message.data[:self.bytes]
             else:
                 # pad the right with zeros
-                message.data += ([0] * (self.bytes - len(message.data)))
+                message.data += (b'\x00' * (self.bytes - len(message.data)))
 
 
     def __str__(self):
diff --git a/obd/protocols/protocol.py b/obd/protocols/protocol.py
@@ -29,7 +29,7 @@
 #                                                                      #
 ########################################################################
 
-from obd.utils import ascii_to_bytes, isHex, numBitsSet
+from obd.utils import isHex, numBitsSet
 from obd.debug import debug
 
 
@@ -56,7 +56,7 @@ class Frame(object):
     """ represents a single parsed line of OBD output """
     def __init__(self, raw):
         self.raw       = raw
-        self.data      = []
+        self.data      = b''
         self.priority  = None
         self.addr_mode = None
         self.rx_id     = None
@@ -71,7 +71,7 @@ class Message(object):
     def __init__(self, frames):
         self.frames = frames
         self.ecu    = ECU.UNKNOWN
-        self.data   = []
+        self.data   = b''
 
     @property
     def tx_id(self):
diff --git a/obd/protocols/protocol_can.py b/obd/protocols/protocol_can.py
@@ -29,6 +29,7 @@
 #                                                                      #
 ########################################################################
 
+from binascii import unhexlify
 from obd.utils import contiguous
 from .protocol import *
 
@@ -63,7 +64,7 @@ def parse_frame(self, frame):
         if self.id_bits == 11:
             raw = "00000" + raw
 
-        raw_bytes = ascii_to_bytes(raw)
+        raw_bytes = unhexlify(raw)
 
         # check for valid size
 
diff --git a/obd/protocols/protocol_legacy.py b/obd/protocols/protocol_legacy.py
@@ -29,6 +29,7 @@
 #                                                                      #
 ########################################################################
 
+from binascii import unhexlify
 from obd.utils import contiguous
 from .protocol import *
 
@@ -46,7 +47,7 @@ def parse_frame(self, frame):
 
         raw = frame.raw
 
-        raw_bytes = ascii_to_bytes(raw)
+        raw_bytes = unhexlify(raw)
 
         if len(raw_bytes) < 6:
             debug("Dropped frame for being too short")
diff --git a/obd/utils.py b/obd/utils.py
@@ -86,10 +86,6 @@ def bytes_to_hex(bs):
         h += ("0" * (2 - len(bh))) + bh
     return h
 
-def ascii_to_bytes(a):
-    """ converts a string of hex to an array of integer byte values """
-    return [ unhex(a[i:i+2]) for i in range(0, len(a), 2) ]
-
 def bitstring(_hex, bits=None):
     b = bin(unhex(_hex))[2:]
     if bits is not None:
diff --git a/tests/test_OBDCommand.py b/tests/test_OBDCommand.py
@@ -62,17 +62,17 @@ def test_call():
     # valid response size
     cmd = OBDCommand("", "", "0123", 4, decode_raw, ECU.ENGINE)
     r = cmd(messages)
-    assert r.value == [0xBE, 0x1F, 0xB8, 0x11]
+    assert r.value == b'\xBE\x1F\xB8\x11'
 
     # response too short (pad)
     cmd = OBDCommand("", "", "0123", 5, decode_raw, ECU.ENGINE)
     r = cmd(messages)
-    assert r.value == [0xBE, 0x1F, 0xB8, 0x11, 0x00]
+    assert r.value == b'\xBE\x1F\xB8\x11\x00'
 
     # response too long (clip)
     cmd = OBDCommand("", "", "0123", 3, decode_raw, ECU.ENGINE)
     r = cmd(messages)
-    assert r.value == [0xBE, 0x1F, 0xB8]
+    assert r.value == b'\xBE\x1F\xB8'
 
 
 
diff --git a/tests/test_protocol_can.py b/tests/test_protocol_can.py
@@ -23,7 +23,7 @@ def check_message(m, num_frames, tx_id, data):
     """ generic test for correct message values """
     assert len(m.frames) == num_frames
     assert m.tx_id       == tx_id
-    assert m.data        == data
+    assert m.data        == bytes(data)
 
 
 
diff --git a/tests/test_protocol_legacy.py b/tests/test_protocol_legacy.py
@@ -20,7 +20,7 @@ def check_message(m, n_frames, tx_id, data):
         """ generic test for correct message values """
         assert len(m.frames) == n_frames
         assert m.tx_id       == tx_id
-        assert m.data        == data
+        assert m.data        == bytes(data)
 
 
 def test_single_frame():
