FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Fix serialization / deserialization of char array. by moriyoshi · Pull Request #21 · tcalmant/python-javaobj · GitHub

/ python-javaobj Public

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
Conversation 5 Commits 2 Checks 0 Files changed
Merged

Fix serialization / deserialization of char array. #21

Show file tree
Hide file tree
Changes from all commits
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 .py  (2) .ser  (1) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
28 changes: 21 additions & 7 deletions javaobj.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,9 @@ def read_to_str(data):
"""
return ''.join(chr(char) for char in data)

unichr = chr
unicode = str

else:
# Python 2 interpreter : str & unicode
def to_str(data, encoding="UTF-8"):
Expand Down Expand Up @@ -981,7 +984,11 @@ def do_array(self, parent=None, ident=0):
else:
for _ in range(size):
res = self._read_value(type_char, ident)
log_debug("Native value: {0}".format(res), ident)
_res = res
# py2
if str is not unicode and isinstance(res, unicode):
_res = res.encode('ascii', 'replace')
log_debug("Native value: {0}".format(_res), ident)
array.append(res)

return array
Expand Down Expand Up @@ -1072,16 +1079,15 @@ def _read_value(self, field_type, ident, name=""):
# We don't need details for arrays and objects
field_type = field_type[0]

_res = None
if field_type == self.TYPE_BOOLEAN:
(val,) = self._readStruct(">B")
res = bool(val)
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 = self._readStruct(">H")[0]
res = unichr(_res)
elif field_type == self.TYPE_SHORT:
(res,) = self._readStruct(">h")
elif field_type == self.TYPE_INTEGER:
Expand All @@ -1097,7 +1103,10 @@ def _read_value(self, field_type, ident, name=""):
else:
raise RuntimeError("Unknown typecode: {0}".format(field_type))

log_debug("* {0} {1}: {2}".format(field_type, name, res), ident)
if _res is None:
_res = res

log_debug("* {0} {1}: {2}".format(field_type, name, _res), ident)
return res

def _convert_char_to_type(self, type_char):
Expand Down Expand Up @@ -1513,7 +1522,10 @@ def write_array(self, obj):
else:
log_debug("Write array of type %s" % type_char)
for v in obj:
log_debug("Writing: %s" % v)
_v = v
if str is not unicode and isinstance(v, unicode):
_v = v.encode('ascii', 'replace')
log_debug("Writing: %s" % _v)
self._write_value(type_char, v)

def _write_value(self, field_type, value):
Expand All @@ -1531,6 +1543,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
Show comments
View file
Open in desktop
Binary file not shown.
7 changes: 7 additions & 0 deletions tests/tests.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
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, [u'\u0000', u'\ud800', u'\u0001', u'\udc00', u'\u0002', u'\uffff', u'\u0003'])
self._try_marshalling(jobj, pobj)

def test_enums(self):
jobj = self.read_file("objEnums.ser")
pobj = javaobj.loads(jobj)
Expand Down
Back | FazBrowse Home | New Git URL