diff --git a/routeros_api/api_structure.py b/routeros_api/api_structure.py index 7899956..2cd7c5f 100644 --- a/routeros_api/api_structure.py +++ b/routeros_api/api_structure.py @@ -28,7 +28,7 @@ def get_mikrotik_value(self, string): return string.encode() def get_python_value(self, bytes): - return bytes.decode() + return bytes.decode('latin-1') class BytesField(Field): @@ -53,7 +53,7 @@ def get_mikrotik_value(self, number): return str(number).encode() def get_python_value(self, bytes): - return int(bytes.decode()) + return int(bytes.decode('latin-1')) class TimedeltaField(Field): @@ -68,7 +68,7 @@ def get_python_value(self, bytes): if bytes == b'none': return None else: - return self.parse_mikrotik_timedelta(bytes.decode()) + return self.parse_mikrotik_timedelta(bytes.decode('latin-1')) def parse_mikrotik_timedelta(self, time_string): new_timedelta_format = ( @@ -100,7 +100,7 @@ def get_mikrotik_value(self, ip_network): def get_python_value(self, bytes): if bytes: - return ipaddress.ip_network(bytes.decode()) + return ipaddress.ip_network(bytes.decode('latin-1')) else: return None diff --git a/routeros_api/sentence.py b/routeros_api/sentence.py index a146910..43ae6b8 100644 --- a/routeros_api/sentence.py +++ b/routeros_api/sentence.py @@ -56,7 +56,10 @@ def __init__(self, path, command, tag=None): def get_api_format(self): formated = [self.path + self.command] for key, value in self.attributes.items(): - formated.append(b'=' + key + b'=' + value) + try: + formated.append(b'=' + key + b'=' + value) + except: + formated.append(b'=' + key + b'=' + value.encode()) for query in self.queries: formated.extend(query.get_api_format()) if self.tag is not None: