Skip to content

Fix serialization / deserialization of char array. #21

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

Merged
tcalmant merged 2 commits into from
May 31, 2018
Merged

Fix serialization / deserialization of char array. #21

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c26690f
Fix serialization / deserialization of char array.
moriyoshi May 31, 2018
38c7b92
Fix logging unprintable characters on Py2.
moriyoshi May 31, 2018
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
Next Next commit
Fix serialization / deserialization of char array.
  • Loading branch information
@moriyoshi
moriyoshi committed May 31, 2018
commit c26690f614696f1e45ff15bae14b35d2353a5c62
9 changes: 5 additions & 4 deletions javaobj.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,8 @@ def read_to_str(data):
"""
return ''.join(chr(char) for char in data)

unichr = chr

else:
# Python 2 interpreter : str & unicode
def to_str(data, encoding="UTF-8"):
Expand Down Expand Up @@ -1078,10 +1080,7 @@ def _read_value(self, field_type, ident, name=""):
elif field_type == self.TYPE_BYTE:
(res,) = self._readStruct(">b")
elif field_type == self.TYPE_CHAR:
# TYPE_CHAR is defined by the serialization specification
# but not used in the implementation, so this is
# a hypothetical code
res = bytes(self._readStruct(">bb")).decode("utf-16-be")
res = unichr(self._readStruct(">H")[0])
elif field_type == self.TYPE_SHORT:
(res,) = self._readStruct(">h")
elif field_type == self.TYPE_INTEGER:
Expand Down Expand Up @@ -1531,6 +1530,8 @@ def _write_value(self, field_type, value):
self._writeStruct(">B", 1, (1 if value else 0,))
elif field_type == self.TYPE_BYTE:
self._writeStruct(">b", 1, (value,))
elif field_type == self.TYPE_CHAR:
self._writeStruct(">H", 1, (ord(value),))
elif field_type == self.TYPE_SHORT:
self._writeStruct(">h", 1, (value,))
elif field_type == self.TYPE_INTEGER:
Expand Down
Binary file added tests/testCharArray.ser
View file
Open in desktop
Binary file not shown.
7 changes: 7 additions & 0 deletions tests/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,13 @@ def test_arrays(self):

self._try_marshalling(jobj, pobj)

def test_char_array(self):
jobj = self.read_file("testCharArray.ser")
pobj = javaobj.loads(jobj)
_logger.debug(pobj)
self.assertEqual(pobj, ['\u0000', '\ud800', '\u0001', '\udc00', '\u0002', '\uffff', '\u0003'])
self._try_marshalling(jobj, pobj)

def test_enums(self):
jobj = self.read_file("objEnums.ser")
pobj = javaobj.loads(jobj)
Expand Down