From f4f2900dcc49cab16def005f2add28eff90909e1 Mon Sep 17 00:00:00 2001 From: TinWoodman92 Date: Wed, 5 Jul 2023 19:57:40 -0500 Subject: Migrated sockets handeling to bytes rather than bits. --- dialoguer/binary_conversion.py | 61 ++++++++++++------------------------------ 1 file changed, 17 insertions(+), 44 deletions(-) (limited to 'dialoguer/binary_conversion.py') diff --git a/dialoguer/binary_conversion.py b/dialoguer/binary_conversion.py index 9bdef6c..73400d6 100644 --- a/dialoguer/binary_conversion.py +++ b/dialoguer/binary_conversion.py @@ -2,55 +2,28 @@ def bin_conv(data, data_type = None): conv_data = None #convert to binary if type(data) == str and data_type == None: - conv_data = reversed(data) - conv_data = ''.join(conv_data) - n = '' - for s in conv_data: - m = ord(s) - m = hex(m) - n += m.lstrip('0x') - conv_data = n - conv_data = int(conv_data, 16) - conv_data = bin(conv_data) - conv_data = conv_data.replace('b', '') - conv_data = ''.join(reversed(conv_data)) - conv_data = conv_data.zfill(8) - n = b'' - for b in conv_data: - m = int(b) - m = chr(m) - m = bytes(m, 'utf-8') - n += m - conv_data = n + conv_data = bytes(data, 'utf-8') elif type(data) == int and data_type == None: - conv_data = bin(data) - conv_data = conv_data.lstrip('0b') - conv_data = conv_data.zfill(8) - conv_data = ''.join(reversed(conv_data)) - n = b'' - for b in conv_data: - m = int(b) - m = chr(m) - m = bytes(m, 'utf-8') - n += m - conv_data = n + conv_data = data.to_bytes(32, 'little') + #print(conv_data) + # conv_data = bin(data) + # conv_data = conv_data.lstrip('0b') + # conv_data = conv_data.zfill(8) + # conv_data = ''.join(reversed(conv_data)) + # n = b'' + # for b in conv_data: + # m = int(b) + # m = chr(m) + # m = bytes(m, 'utf-8') + # n += m + # conv_data = n #convert from binary elif type(data) == bytes and data_type == str: - n = '' - for b in data: n = f'{b}{n}' - conv_data = n - conv_data = int(conv_data, 2) - conv_data = hex(conv_data) - conv_data = conv_data.lstrip('0x') - conv_data = bytearray.fromhex(conv_data) - conv_data = conv_data.decode() - conv_data = ''.join(reversed(conv_data)) + conv_data = data.decode() + conv_data = conv_data.rstrip('\x00') elif type(data) == bytes and data_type == int: - n = '' - for b in data: n = f'{b}{n}' - conv_data = n - conv_data = int(conv_data, 2) + conv_data = int.from_bytes(data, 'little') elif type(data) == bytes and data_type == bool: conv_data = bool(data[0]) -- cgit v1.2.3