black code style

Author: andreax79

cstruct/abstract.py

@@ -32,7 +32,7 @@
 from enum import IntEnum, EnumMeta, _EnumDict
 from unicodedata import name
 from .base import STRUCTS, ENUMS, DEFAULT_ENUM_SIZE
-from .c_parser import parse_struct, parse_struct_def, parse_enum_def,parse_enum, Tokens
+from .c_parser import parse_struct, parse_struct_def, parse_enum_def, parse_enum, Tokens
 from .field import calculate_padding, FieldType
 from .exceptions import CStructException, CEnumException
 
@@ -111,7 +111,7 @@ def parse(
         __name__: Optional[str] = None,
         __byte_order__: Optional[str] = None,
         __is_union__: Optional[bool] = False,
-        **kargs: Dict[str, Any]
+        **kargs: Dict[str, Any],
     ) -> Type["AbstractCStruct"]:
         """
         Return a new class mapping a C struct/union definition.
@@ -302,6 +302,7 @@ def size(cls) -> int:
         "Enum size (in bytes)"
         return cls.__size__
 
+
 class AbstractCEnum(IntEnum, metaclass=CEnumMeta):
     """
     Abstract C enum to Python class
@@ -313,7 +314,7 @@ def parse(
         __enum__: Union[str, Tokens, Dict[str, Any]],
         __name__: Optional[str] = None,
         __size__: Optional[int] = None,
-        **kargs: Dict[str, Any]
+        **kargs: Dict[str, Any],
     ) -> Type["AbstractCEnum"]:
         """
         Return a new Python Enum class mapping a C enum definition
@@ -341,4 +342,4 @@ def parse(
             cls_kargs["__anonymous__"] = True
 
         cls_kargs.update(cls_kargs["__constants__"])
-        return cls(__name__, cls_kargs)
+        return cls(__name__, cls_kargs)

cstruct/base.py

@@ -93,12 +93,7 @@
     'uint64': 'Q',
 }
 
-ENUM_SIZE_TO_C_TYPE: Dict[int, str] = {
-    1: 'int8',
-    2: 'int16',
-    4: 'int32',
-    8: 'int64'
-}
+ENUM_SIZE_TO_C_TYPE: Dict[int, str] = {1: 'int8', 2: 'int16', 4: 'int32', 8: 'int64'}
 
 CHAR_ZERO = bytes('\0', 'ascii')
-DEFAULT_ENUM_SIZE = 4
+DEFAULT_ENUM_SIZE = 4

cstruct/c_parser.py

@@ -137,7 +137,7 @@ def parse_type(tokens: Tokens, __cls__: Type['AbstractCStruct'], byte_order: Opt
             except KeyError:
                 raise ParserError("Unknow {} {}".format(c_type, tail))
     elif c_type.startswith('enum'):
-        #from .abstract import AbstractCEnum
+        # from .abstract import AbstractCEnum
         from .cenum import CEnum
 
         c_type, tail = c_type.split(' ', 1)
@@ -165,7 +165,7 @@ def parse_struct_def(
     __def__: Union[str, Tokens],
     __cls__: Type['AbstractCStruct'],
     __byte_order__: Optional[str] = None,
-    **kargs: Any  # Type['AbstractCStruct'],
+    **kargs: Any,  # Type['AbstractCStruct'],
 ) -> Optional[Dict[str, Any]]:
     # naive C struct parsing
     if isinstance(__def__, Tokens):
@@ -188,10 +188,7 @@ def parse_struct_def(
         raise ParserError("{} definition expected".format(vtype))
 
 
-def parse_enum_def(
-    __def__: Union[str, Tokens],
-    **kargs: Any
-) -> Optional[Dict[str, Any]]:
+def parse_enum_def(__def__: Union[str, Tokens], **kargs: Any) -> Optional[Dict[str, Any]]:
     # naive C enum parsing
     if isinstance(__def__, Tokens):
         tokens = __def__
@@ -213,10 +210,7 @@ def parse_enum_def(
         raise ParserError(f"{vtype} definition expected")
 
 
-def parse_enum(
-    __enum__: Union[str, Tokens],
-    **kargs: Any
-) -> Optional[Dict[str, Any]]:
+def parse_enum(__enum__: Union[str, Tokens], **kargs: Any) -> Optional[Dict[str, Any]]:
     constants: Dict[str, int] = OrderedDict()
 
     if isinstance(__enum__, Tokens):
@@ -265,9 +259,7 @@ def parse_enum(
         if next_token == "}":
             break
 
-    result = {
-        '__constants__': constants
-    }
+    result = {'__constants__': constants}
     return result
 
 
@@ -276,7 +268,7 @@ def parse_struct(
     __cls__: Type['AbstractCStruct'],
     __is_union__: bool = False,
     __byte_order__: Optional[str] = None,
-    **kargs: Any
+    **kargs: Any,
 ) -> Dict[str, Any]:
     # naive C struct parsing
     __is_union__ = bool(__is_union__)

cstruct/cenum.py

@@ -1,4 +1,5 @@
 from .abstract import AbstractCEnum
 
+
 class CEnum(AbstractCEnum):
-  ...
+    ...

cstruct/exceptions.py

@@ -29,9 +29,11 @@
     "EvalError",
 ]
 
+
 class CEnumException(Exception):
     pass
 
+
 class CStructException(Exception):
     pass
 

tests/test_cenum.py

@@ -1,17 +1,19 @@
 from cstruct import CEnum
 
+
 class Dummy(CEnum):
-  __enum__ = """
+    __enum__ = """
     A,
     B,
     C = 2,
     D = 5 + 7,
     E = 2
   """
 
+
 def test_dummy():
-  assert Dummy.A == 0
-  assert Dummy.B == 1
-  assert Dummy.C == 2
-  assert Dummy.D == 12
-  assert Dummy.E == 2
+    assert Dummy.A == 0
+    assert Dummy.B == 1
+    assert Dummy.C == 2
+    assert Dummy.D == 12
+    assert Dummy.E == 2

tests/test_cstruct.py

@@ -261,7 +261,5 @@ def test_null_compare():
 
 def test_invalid_inline():
     with pytest.raises(ParserError):
-        cstruct.MemCStruct.parse(
-            'struct { unsigned char head; unsigned char head; }', __byte_order__=cstruct.LITTLE_ENDIAN
-        )
+        cstruct.MemCStruct.parse('struct { unsigned char head; unsigned char head; }', __byte_order__=cstruct.LITTLE_ENDIAN)
         assert False

tests/test_define.py

@@ -87,16 +87,20 @@ class Invalid(cstruct.CStruct):
 
 def test_invalid_define():
     with pytest.raises(ParserError):
-        cstruct.parse("""
+        cstruct.parse(
+            """
             #define xxx yyy zzz
-        """)
+        """
+        )
 
 
 def test_invalid_struct():
     with pytest.raises(ParserError):
-        cstruct.parse("""
+        cstruct.parse(
+            """
                 struct {
                     int a;
                     int;
                 }
-        """)
+        """
+        )

tests/test_memcstruct.py

@@ -255,7 +255,5 @@ def test_null_compare():
 
 def test_invalid_inline():
     with pytest.raises(ParserError):
-        cstruct.MemCStruct.parse(
-            'struct { unsigned char head; unsigned char head; }', __byte_order__=cstruct.LITTLE_ENDIAN
-        )
+        cstruct.MemCStruct.parse('struct { unsigned char head; unsigned char head; }', __byte_order__=cstruct.LITTLE_ENDIAN)
         assert False