From 7b14250044a45d9e27611a45d089f638e4497f0c Mon Sep 17 00:00:00 2001
From: Clayton Smith <argilo@gmail.com>
Date: Mon, 5 Oct 2020 22:31:56 -0400
Subject: digital: remove six
---
gr-digital/python/digital/packet_utils.py | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
(limited to 'gr-digital/python/digital/packet_utils.py')
diff --git a/gr-digital/python/digital/packet_utils.py b/gr-digital/python/digital/packet_utils.py
index 08e8f36467..b79994b667 100644
--- a/gr-digital/python/digital/packet_utils.py
+++ b/gr-digital/python/digital/packet_utils.py
@@ -11,7 +11,6 @@
import struct
import numpy
-import six
from gnuradio import gru
from . import crc
@@ -19,20 +18,19 @@ from . import crc
def conv_packed_binary_string_to_1_0_string(s):
"""
- '\xAF' --> '10101111'
+ b'\xAF' --> '10101111'
"""
r = []
for ch in s:
- x = ord(ch)
for i in range(7,-1,-1):
- t = (x >> i) & 0x1
+ t = (ch >> i) & 0x1
r.append(t)
return ''.join([chr(x + ord('0')) for x in r])
def conv_1_0_string_to_packed_binary_string(s):
"""
- '10101111' -> ('\xAF', False)
+ '10101111' -> (b'\xAF', False)
Basically the inverse of conv_packed_binary_string_to_1_0_string,
but also returns a flag indicating if we had to pad with leading zeros
@@ -57,15 +55,15 @@ def conv_1_0_string_to_packed_binary_string(s):
t = 0
for j in range(8):
t = (t << 1) | (ord(s[i + j]) - ord('0'))
- r.append(chr(t))
+ r.append(t)
i += 8
- return (''.join(r), padded)
+ return (bytes(r), padded)
default_access_code = \
- conv_packed_binary_string_to_1_0_string('\xAC\xDD\xA4\xE2\xF2\x8C\x20\xFC')
+ conv_packed_binary_string_to_1_0_string(b'\xAC\xDD\xA4\xE2\xF2\x8C\x20\xFC')
default_preamble = \
- conv_packed_binary_string_to_1_0_string('\xA4\xF2')
+ conv_packed_binary_string_to_1_0_string(b'\xA4\xF2')
def is_1_0_string(s):
if not isinstance(s, str):
--
cgit v1.2.3