Skip to content

Update api_structure.py #74

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
wagneracacio wants to merge 4 commits into from
Closed

Update api_structure.py #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d7ecd0e
Update api_structure.py
wagneracacio May 28, 2021
ccbe036
Update api_structure.py
wagneracacio May 28, 2021
5eaf5cb
Update test_resource.py
wagneracacio Jun 4, 2021
de68612
Update api_structure.py
wagneracacio Jun 4, 2021
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
3 changes: 3 additions & 0 deletions routeros_api/api_structure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import datetime
import ipaddress
import re
import cchardet as chardet


class Field(object):
Expand All @@ -28,6 +29,8 @@ def get_mikrotik_value(self, string):
return string.encode()

def get_python_value(self, bytes):
if bytes:
return bytes.decode(chardet.detect(bytes)['encoding'])
return bytes.decode()


Expand Down
13 changes: 13 additions & 0 deletions tests/test_resource.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,3 +68,16 @@ def test_boolean_resource_set(self):
communicator.call.assert_called_with(
'/boolean/', 'set', arguments={'boolean': b'yes'}, queries={},
additional_queries=())


def test_unicode_decode_error(self):
string = structure.StringField
output = string.get_python_value(string,bytes=b'\xc2')
self.assertEqual(output, 'Â')



def test_blank_decode_byte(self):
string = structure.StringField
output = string.get_python_value(string,bytes=b'')
self.assertEqual(output, '')