Skip to content

Fixed issues when dealing with latin-1 charachters #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
willnaoosmith wants to merge 3 commits into from
Closed

Fixed issues when dealing with latin-1 charachters #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e4f44bd
Fixed decoding errors caused by 'ç' character
willnaoosmith Mar 8, 2023
61c03d6
Update sentence.py
willnaoosmith Mar 9, 2023
be2ae59
Merge branch 'socialwifi:master' into master
willnaoosmith Jun 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions routeros_api/api_structure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand All @@ -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):
Expand All @@ -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 = (
Expand Down Expand Up @@ -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

Expand Down
5 changes: 4 additions & 1 deletion routeros_api/sentence.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down