Re-format with black

Author: tcalmant

javaobj/core.py

@@ -39,7 +39,6 @@
 import logging
 import os
 import struct
-import sys
 
 try:
     # Python 2
@@ -1663,6 +1662,7 @@ def _convert_type_to_char(self, type_char):
 
 # ------------------------------------------------------------------------------
 
+
 def read(data, fmt_str):
     """
     Reads input bytes and extract the given structure. Returns both the read
@@ -1677,16 +1677,16 @@ def read(data, fmt_str):
 
 
 def read_string(data, length_fmt="H"):
-        """
-        Reads a serialized string
+    """
+    Reads a serialized string
 
-        :param data: Bytes where to read the string from
-        :param length_fmt: Structure format of the string length (H or Q)
-        :return: The deserialized string
-        """
-        (length,), data = read(data, ">{0}".format(length_fmt))
-        ba, data = data[:length], data[length:]
-        return to_unicode(ba), data
+    :param data: Bytes where to read the string from
+    :param length_fmt: Structure format of the string length (H or Q)
+    :return: The deserialized string
+    """
+    (length,), data = read(data, ">{0}".format(length_fmt))
+    ba, data = data[:length], data[length:]
+    return to_unicode(ba), data
 
 
 class DefaultObjectTransformer(object):
@@ -1718,6 +1718,7 @@ class JavaPrimitiveClass(JavaObject):
         """
         Parent of Java classes matching a primitive (Bool, Integer, Long, ...)
         """
+
         def __init__(self, unmarshaller):
             JavaObject.__init__(self)
             self.value = None
@@ -1729,7 +1730,7 @@ def __repr__(self):
             return repr(self.value)
 
         def __hash__(self):
-                return hash(self.value)
+            return hash(self.value)
 
         def __eq__(self, other):
             return self.value == other
@@ -1827,6 +1828,7 @@ class JavaTime(JavaObject):
         The semantic of the fields depends on the type of time that has been
         parsed
         """
+
         DURATION_TYPE = 1
         INSTANT_TYPE = 2
         LOCAL_DATE_TYPE = 3
@@ -1905,27 +1907,27 @@ def do_instant(self, unmarshaller, data):
             return data
 
         def do_local_date(self, unmarshaller, data):
-            (self.year, self.month, self.day), data = read(data, '>ibb')
+            (self.year, self.month, self.day), data = read(data, ">ibb")
             return data
 
         def do_local_time(self, unmarshaller, data):
-            (hour,), data = read(data, '>b')
+            (hour,), data = read(data, ">b")
             minute = 0
             second = 0
             nano = 0
 
             if hour < 0:
                 hour = ~hour
             else:
-                (minute,), data = read(data, '>b')
+                (minute,), data = read(data, ">b")
                 if minute < 0:
                     minute = ~minute
                 else:
-                    (second,), data = read(data, '>b')
+                    (second,), data = read(data, ">b")
                     if second < 0:
                         second = ~second
                     else:
-                        (nano,), data = read(data, '>i')
+                        (nano,), data = read(data, ">i")
 
             self.hour = hour
             self.minute = minute

javaobj/modifiedutf8.py

@@ -10,9 +10,11 @@
 https://github.com/swstephe/py2jdbc/
 
 :authors: Scott Stephens (@swstephe), @guywithface
+:license: Apache License 2.0
+:version: 0.3.0
+:status: Alpha
 """
 
-
 # Module version
 __version_info__ = (0, 3, 0)
 __version__ = ".".join(str(x) for x in __version_info__)

setup.py

@@ -53,6 +53,7 @@ def read(fname):
     with open(os.path.join(os.path.dirname(__file__), fname)) as fd:
         return fd.read()
 
+
 # ------------------------------------------------------------------------------
 
 
@@ -65,19 +66,20 @@ def read(fname):
     maintainer_email="thomas.calmant@gmail.com",
     url="https://github.com/tcalmant/python-javaobj",
     description="Module for serializing and de-serializing Java objects.",
-    license='Apache License 2.0',
+    license="Apache License 2.0",
     keywords="python java marshalling serialization",
-    packages=['javaobj'],
+    packages=["javaobj"],
     test_suite="tests.tests",
-    long_description=read('README.rst'),
+    long_description=read("README.rst"),
     classifiers=[
-            "Development Status :: 3 - Alpha",
-            "License :: OSI Approved :: Apache Software License",
-            'Operating System :: OS Independent',
-            'Programming Language :: Python :: 2.7',
-            'Programming Language :: Python :: 3.4',
-            'Programming Language :: Python :: 3.5',
-            'Programming Language :: Python :: 3.6',
-            'Programming Language :: Python :: 3.7',
-            "Topic :: Software Development :: Libraries :: Python Modules",
-    ])
+        "Development Status :: 3 - Alpha",
+        "License :: OSI Approved :: Apache Software License",
+        "Operating System :: OS Independent",
+        "Programming Language :: Python :: 2.7",
+        "Programming Language :: Python :: 3.4",
+        "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
+        "Topic :: Software Development :: Libraries :: Python Modules",
+    ],
+)