Reformart + disabled some Flake8 warnings

Some unused/unknown imports are required

Author: tcalmant

javaobj/__init__.py

@@ -34,9 +34,9 @@
 """
 
 # Imports giving access to what the javaobj module provides
-from javaobj.v1.beans import *
-from javaobj.v1.core import *
-from javaobj.v1.transformers import *
+from javaobj.v1.beans import *  # noqa: F401,F403
+from javaobj.v1.core import *  # noqa: F401,F403
+from javaobj.v1.transformers import *  # noqa: F401,F403
 
 # ------------------------------------------------------------------------------
 

javaobj/modifiedutf8.py

@@ -47,7 +47,7 @@ def byte_to_int(data):
 
 
 else:
-    unicode_char = unichr  # pylint:disable=undefined-variable
+    unicode_char = unichr  # pylint:disable=undefined-variable  # noqa: F821
 
     def byte_to_int(data):
         # type: (bytes) -> int

javaobj/utils.py

@@ -30,7 +30,7 @@
 from __future__ import absolute_import
 
 # Standard library
-from typing import Any, Tuple
+from typing import Any, Tuple  # noqa: F401
 import logging
 import struct
 import sys
@@ -190,8 +190,8 @@ def read_to_str(data):
 
 else:
     BYTES_TYPE = str
-    UNICODE_TYPE = unicode  # pylint:disable=undefined-variable
-    unicode_char = unichr  # pylint:disable=undefined-variable
+    UNICODE_TYPE = unicode  # pylint:disable=undefined-variable  # noqa: F821
+    unicode_char = unichr  # pylint:disable=undefined-variable  # noqa: F821
     bytes_char = chr
 
     # Python 2 interpreter : str & unicode

javaobj/v1/__init__.py

@@ -24,15 +24,15 @@
     limitations under the License.
 """
 
-from . import beans, core, transformers
-from .core import (
+from . import beans, core, transformers  # noqa: F401
+from .core import (  # noqa: F401
     load,
     loads,
     dumps,
     JavaObjectMarshaller,
     JavaObjectUnmarshaller,
 )
-from .transformers import DefaultObjectTransformer
+from .transformers import DefaultObjectTransformer  # noqa: F401
 
 # ------------------------------------------------------------------------------
 

javaobj/v1/beans.py

@@ -201,6 +201,7 @@ def __init__(self, classdesc=None):
     def __hash__(self):
         return list.__hash__(self)
 
+
 class JavaByteArray(JavaObject):
     """
     Represents the special case of Java Array which contains bytes

javaobj/v1/core.py

@@ -109,11 +109,7 @@ def loads(string, *transformers, **kwargs):
     :return: The deserialized object
     """
     # Reuse the load method (avoid code duplication)
-    return load(
-        BytesIO(string),
-        *transformers,
-        **kwargs
-    )
+    return load(BytesIO(string), *transformers, **kwargs)
 
 
 def dumps(obj, *transformers):

javaobj/v1/transformers.py

@@ -37,7 +37,6 @@
     log_debug,
     log_error,
     to_bytes,
-    to_unicode,
     read_struct,
     read_string,
 )
@@ -63,7 +62,7 @@ def __init__(self, unmarshaller):
             JavaObject.__init__(self)
 
         def __hash__(self):
-                return list.__hash__(self)
+            return list.__hash__(self)
 
         def __extra_loading__(self, unmarshaller, ident=0):
             # type: (JavaObjectUnmarshaller, int) -> None
@@ -144,9 +143,7 @@ def __extra_loading__(self, unmarshaller, ident=0):
             self.buckets = unmarshaller._read_value(
                 TypeCode.TYPE_INTEGER, ident
             )
-            self.size = unmarshaller._read_value(
-                TypeCode.TYPE_INTEGER, ident
-            )
+            self.size = unmarshaller._read_value(TypeCode.TYPE_INTEGER, ident)
 
             # Read entries
             for _ in range(self.size):
@@ -175,7 +172,7 @@ def __init__(self, unmarshaller):
             JavaObject.__init__(self)
 
         def __hash__(self):
-                return set.__hash__(self)
+            return set.__hash__(self)
 
         def __extra_loading__(self, unmarshaller, ident=0):
             # type: (JavaObjectUnmarshaller, int) -> None

javaobj/v1/unmarshaller.py

@@ -221,7 +221,8 @@ def _read_and_exec_opcode(self, ident=0, expect=None):
 
         if expect and opid not in expect:
             raise IOError(
-                "Unexpected opcode 0x{0:X} -- {1} (at offset 0x{2:X})".format(
+                "Unexpected opcode 0x{0:X} -- {1} "
+                "(at offset 0x{2:X})".format(
                     opid, StreamCodeDebug.op_id(opid), position
                 )
             )
@@ -230,9 +231,8 @@ def _read_and_exec_opcode(self, ident=0, expect=None):
             handler = self.opmap[opid]
         except KeyError:
             raise RuntimeError(
-                "Unknown OpCode in the stream: 0x{0:X} (at offset 0x{1:X})".format(
-                    opid, position
-                )
+                "Unknown OpCode in the stream: 0x{0:X} "
+                "(at offset 0x{1:X})".format(opid, position)
             )
         else:
             return opid, handler(ident=ident)
@@ -656,7 +656,9 @@ def do_array(self, parent=None, ident=0):
             array = JavaByteArray(self.object_stream.read(size), classdesc)
         elif self.use_numpy_arrays and numpy is not None:
             array = numpy.fromfile(
-                self.object_stream, dtype=NUMPY_TYPE_MAP[type_code], count=size,
+                self.object_stream,
+                dtype=NUMPY_TYPE_MAP[type_code],
+                count=size,
             )
         else:
             for _ in range(size):
@@ -823,7 +825,8 @@ def _oops_dump_state(self, ignore_remaining_data=False):
         log_error("==Oops state dump" + "=" * (30 - 17))
         log_error("References: {0}".format(self.references))
         log_error(
-            "Stream seeking back at -16 byte (2nd line is an actual position!):"
+            "Stream seeking back at -16 byte "
+            "(2nd line is an actual position!):"
         )
 
         # Do not use a keyword argument

javaobj/v2/__init__.py

@@ -35,8 +35,8 @@
     limitations under the License.
 """
 
-from . import api, beans, core, main, stream, transformers
-from .main import load, loads
+from . import api, beans, core, main, stream, transformers  # noqa: 401
+from .main import load, loads  # noqa: 401
 
 # ------------------------------------------------------------------------------
 

javaobj/v2/core.py

@@ -27,11 +27,9 @@
 
 from __future__ import absolute_import
 
-from enum import Enum
 from typing import Any, Callable, Dict, IO, List, Optional
 import logging
 import os
-import struct
 
 from . import api
 from .beans import (
@@ -53,14 +51,13 @@
 from .stream import DataStreamReader
 from .transformers import DefaultObjectTransformer
 from ..constants import (
-    ClassDescFlags,
     StreamConstants,
     TerminalCode,
     TypeCode,
     PRIMITIVE_TYPES,
 )
 
-from ..modifiedutf8 import decode_modified_utf8
+from ..modifiedutf8 import decode_modified_utf8  # noqa: F401
 
 # ------------------------------------------------------------------------------
 
@@ -412,7 +409,9 @@ def _do_classdesc(self, type_code):
             # Reference to an already loading class description
             previous = self._do_reference()
             if not isinstance(previous, JavaClassDesc):
-                raise ValueError("Referenced object is not a class description")
+                raise ValueError(
+                    "Referenced object is not a class description"
+                )
             return previous
         elif type_code == TerminalCode.TC_PROXYCLASSDESC:
             # Proxy class description