Fixed the TypeCode conversion issue

Input field type can be unicode in Python 2

Author: tcalmant

javaobj/utils.py

@@ -138,6 +138,7 @@ def hexdump(src, start_offset=0, length=16):
 
 
 if sys.version_info[0] >= 3:
+    BYTES_TYPE = bytes
     UNICODE_TYPE = str
     unicode_char = chr
 
@@ -187,6 +188,7 @@ def read_to_str(data):
 
 
 else:
+    BYTES_TYPE = str
     UNICODE_TYPE = unicode  # pylint:disable=undefined-variable
     unicode_char = unichr  # pylint:disable=undefined-variable
     bytes_char = chr

javaobj/v1/core.py

@@ -74,6 +74,7 @@
     to_bytes,
     to_str,
     to_unicode,
+    BYTES_TYPE,
     UNICODE_TYPE,
     unicode_char,
     hexdump,
@@ -817,11 +818,11 @@ def _read_value(self, raw_field_type, ident, name=""):
         :return: The read value
         :raise RuntimeError: Unknown field type
         """
-        if isinstance(raw_field_type, (bytes, str)):
+        if isinstance(raw_field_type, (TypeCode, int)):
+            field_type = raw_field_type
+        else:
             # We don't need details for arrays and objects
             field_type = TypeCode(ord(raw_field_type[0]))
-        else:
-            field_type = raw_field_type
 
         if field_type == TypeCode.TYPE_BOOLEAN:
             (val,) = self._readStruct(">B")
@@ -1343,11 +1344,11 @@ def _write_value(self, raw_field_type, value):
         :param raw_field_type: Value type
         :param value: The value itself
         """
-        if isinstance(raw_field_type, (bytes, str)):
+        if isinstance(raw_field_type, (TypeCode, int)):
+            field_type = raw_field_type
+        else:
             # We don't need details for arrays and objects
             field_type = TypeCode(ord(raw_field_type[0]))
-        else:
-            field_type = raw_field_type
 
         if field_type == TypeCode.TYPE_BOOLEAN:
             self._writeStruct(">B", 1, (1 if value else 0,))
@@ -1376,7 +1377,7 @@ def _write_value(self, raw_field_type, value):
                 self.write_object(value)
             elif isinstance(value, JavaString):
                 self.write_string(value)
-            elif isinstance(value, (bytes, str)):
+            elif isinstance(value, (BYTES_TYPE, UNICODE_TYPE)):
                 self.write_blockdata(value)
             else:
                 raise RuntimeError("Unknown typecode: {0}".format(field_type))