diff options
Diffstat (limited to 'gr-digital/python/digital/qa_packet_format.py')
| -rw-r--r-- | gr-digital/python/digital/qa_packet_format.py | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/gr-digital/python/digital/qa_packet_format.py b/gr-digital/python/digital/qa_packet_format.py index 29c3a61b88..a112bb355a 100644 --- a/gr-digital/python/digital/qa_packet_format.py +++ b/gr-digital/python/digital/qa_packet_format.py @@ -9,7 +9,6 @@ # import time, struct -import six import pmt from gnuradio import gr, gr_unittest, digital, blocks @@ -35,10 +34,10 @@ class test_packet_format_fb(gr_unittest.TestCase): self.tb.msg_connect(formatter, 'payload', snk_pld, 'store') - send_str = "Hello World" - send_pmt = pmt.make_u8vector(len(send_str), ord(' ')) + send_str = b"Hello World" + send_pmt = pmt.make_u8vector(len(send_str), 0) for i in range(len(send_str)): - pmt.u8vector_set(send_pmt, i, ord(send_str[i])) + pmt.u8vector_set(send_pmt, i, send_str[i]) msg = pmt.cons(pmt.PMT_NIL, send_pmt) port = pmt.intern("in") @@ -56,14 +55,14 @@ class test_packet_format_fb(gr_unittest.TestCase): result_hdr = pmt.u8vector_elements(result_hdr_pmt) result_pld = pmt.u8vector_elements(result_pld_pmt) - header = "".join(chr(r) for r in result_hdr) - payload = "".join(chr(r) for r in result_pld) + header = bytes(result_hdr) + payload = bytes(result_pld) access_code = packet_utils.conv_1_0_string_to_packed_binary_string(packet_utils.default_access_code)[0] rx_access_code = header[0:len(access_code)] length = len(send_str) - rx_length = struct.unpack_from(b"!H", six.b(header), len(access_code))[0] + rx_length = struct.unpack_from(b"!H", header, len(access_code))[0] self.assertEqual(access_code, rx_access_code) self.assertEqual(length, rx_length) @@ -129,10 +128,10 @@ class test_packet_format_fb(gr_unittest.TestCase): self.tb.msg_connect(formatter, 'payload', snk_pld, 'store') - send_str = "Hello World" + 1000*"xxx" - send_pmt = pmt.make_u8vector(len(send_str), ord(' ')) + send_str = b"Hello World" + 1000*b"xxx" + send_pmt = pmt.make_u8vector(len(send_str), 0) for i in range(len(send_str)): - pmt.u8vector_set(send_pmt, i, ord(send_str[i])) + pmt.u8vector_set(send_pmt, i, send_str[i]) msg = pmt.cons(pmt.PMT_NIL, send_pmt) port = pmt.intern("in") @@ -149,16 +148,16 @@ class test_packet_format_fb(gr_unittest.TestCase): result_hdr = pmt.u8vector_elements(result_hdr_pmt) result_pld = pmt.u8vector_elements(result_pld_pmt) - header = "".join(chr(r) for r in result_hdr) - payload = "".join(chr(r) for r in result_pld) + header = bytes(result_hdr) + payload = bytes(result_pld) access_code = packet_utils.conv_1_0_string_to_packed_binary_string(packet_utils.default_access_code)[0] rx_access_code = header[0:len(access_code)] length = len(send_str) - rx_length = struct.unpack_from(b"!H", six.b(header), len(access_code))[0] - rx_bps = struct.unpack_from(b"!H", six.b(header), len(access_code)+4)[0] - rx_counter = struct.unpack_from(b"!H", six.b(header), len(access_code)+6)[0] + rx_length = struct.unpack_from(b"!H", header, len(access_code))[0] + rx_bps = struct.unpack_from(b"!H", header, len(access_code)+4)[0] + rx_counter = struct.unpack_from(b"!H", header, len(access_code)+6)[0] self.assertEqual(access_code, rx_access_code) self.assertEqual(length, rx_length) |