isort

Author: andreax79

Makefile

@@ -2,6 +2,7 @@ SHELL=/bin/bash -e
 
 help:
 	@echo - make black ------ Format code
+	@echo - make isort ------ Sort imports
 	@echo - make clean ------ Clean virtual environment
 	@echo - make coverage --- Run tests coverage
 	@echo - make docs ------- Make docs
@@ -11,8 +12,13 @@ help:
 	@echo - make typecheck -- Typecheck
 	@echo - make venv ------- Create virtual environment
 
-black:
-	black -S cstruct tests examples setup.py
+.PHONY: isort
+isort:
+	@isort --profile black cstruct tests examples setup.py
+
+.PHONY: black
+black: isort
+	@black -S cstruct tests examples setup.py
 
 clean:
 	-rm -rf build dist

README.md

@@ -8,6 +8,7 @@ C-style structs for Python
 [![PyPI](https://img.shields.io/pypi/pyversions/cstruct.svg)](https://pypi.org/project/cstruct)
 [![Downloads](https://pepy.tech/badge/cstruct/month)](https://pepy.tech/project/cstruct)
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
+[![Imports: isort](https://img.shields.io/badge/%20imports-isort-%231674b1?style=flat&labelColor=ef8336)](https://pycqa.github.io/isort/)
 [![Known Vulnerabilities](https://snyk.io/test/github/andreax79/python-cstruct/badge.svg)](https://snyk.io/test/github/andreax79/python-cstruct)
 [![Documentation](https://readthedocs.org/projects/python-cstruct/badge/?version=latest)](https://python-cstruct.readthedocs.io/en/latest/)
 

cstruct/__init__.py

@@ -28,21 +28,22 @@
 __date__ = "15 August 2013"
 
 from typing import Any, Dict, Optional, Type, Union
+
+from .abstract import AbstractCEnum, AbstractCStruct, CStructMeta
 from .base import (
-    LITTLE_ENDIAN,
     BIG_ENDIAN,
+    CHAR_ZERO,
+    DEFINES,
+    ENUMS,
+    LITTLE_ENDIAN,
     NATIVE_ORDER,
     STRUCTS,
-    ENUMS,
-    DEFINES,
     TYPEDEFS,
-    CHAR_ZERO,
 )
-from .abstract import CStructMeta, AbstractCStruct, AbstractCEnum
-from .cstruct import CStruct
 from .c_parser import parse_struct_def
-from .mem_cstruct import MemCStruct
 from .cenum import CEnum
+from .cstruct import CStruct
+from .mem_cstruct import MemCStruct
 from .native_types import get_native_type
 
 __all__ = [

cstruct/abstract.py

@@ -24,18 +24,19 @@
 # IN THE SOFTWARE.
 #
 
+import hashlib
+import struct
 from abc import ABCMeta
 from collections import OrderedDict
-from typing import Any, BinaryIO, List, Dict, Optional, Type, Tuple, Union
-import hashlib
+from enum import EnumMeta, IntEnum, _EnumDict
 from io import StringIO
-from enum import IntEnum, EnumMeta, _EnumDict
-import struct
-from .base import STRUCTS, ENUMS, DEFAULT_ENUM_SIZE, ENUM_SIZE_TO_C_TYPE
-from .c_parser import parse_struct, parse_struct_def, parse_enum_def, parse_enum, Tokens
-from .field import calculate_padding, FieldType
-from .native_types import get_native_type
+from typing import Any, BinaryIO, Dict, List, Optional, Tuple, Type, Union
+
+from .base import DEFAULT_ENUM_SIZE, ENUM_SIZE_TO_C_TYPE, ENUMS, STRUCTS
+from .c_parser import Tokens, parse_enum, parse_enum_def, parse_struct, parse_struct_def
 from .exceptions import CStructException, ParserError
+from .field import FieldType, calculate_padding
+from .native_types import get_native_type
 
 __all__ = ["CStructMeta", "AbstractCStruct", "CEnumMeta", "AbstractCEnum"]
 

cstruct/base.py

@@ -22,10 +22,10 @@
 # IN THE SOFTWARE.
 #
 
-from typing import Any, Dict, Type, TYPE_CHECKING
+from typing import TYPE_CHECKING, Any, Dict, Type
 
 if TYPE_CHECKING:
-    from .abstract import AbstractCStruct, AbstractCEnum
+    from .abstract import AbstractCEnum, AbstractCStruct
 
 __all__ = [
     "LITTLE_ENDIAN",

cstruct/c_expr.py

@@ -24,7 +24,8 @@
 
 import ast
 import operator
-from typing import Any, Callable, Dict, Union, Type, TYPE_CHECKING
+from typing import TYPE_CHECKING, Any, Callable, Dict, Type, Union
+
 from .base import DEFINES, STRUCTS
 from .exceptions import EvalError
 

cstruct/c_parser.py

@@ -24,15 +24,16 @@
 
 import re
 from collections import OrderedDict
-from typing import Union, Optional, Any, Dict, List, Type, TYPE_CHECKING
-from .base import DEFINES, ENUMS, TYPEDEFS, STRUCTS
-from .field import calculate_padding, Kind, FieldType
+from typing import TYPE_CHECKING, Any, Dict, List, Optional, Type, Union
+
+from .base import DEFINES, ENUMS, STRUCTS, TYPEDEFS
 from .c_expr import c_eval
 from .exceptions import CStructException, ParserError
+from .field import FieldType, Kind, calculate_padding
 from .native_types import get_native_type
 
 if TYPE_CHECKING:
-    from .abstract import AbstractCStruct, AbstractCEnum
+    from .abstract import AbstractCEnum, AbstractCStruct
 
 __all__ = ["parse_struct", "parse_struct_def", "parse_enum_def", "Tokens"]
 

cstruct/cstruct.py

@@ -23,8 +23,9 @@
 #
 
 from typing import List, Optional
-from .base import CHAR_ZERO
+
 from .abstract import AbstractCStruct
+from .base import CHAR_ZERO
 
 
 class CStruct(AbstractCStruct):

cstruct/field.py

@@ -25,10 +25,11 @@
 import copy
 import struct
 from enum import Enum
-from typing import Optional, Any, List, Type, TYPE_CHECKING
+from typing import TYPE_CHECKING, Any, List, Optional, Type
+
 from .base import NATIVE_ORDER
-from .native_types import get_native_type
 from .exceptions import ParserError
+from .native_types import get_native_type
 
 if TYPE_CHECKING:
     from .abstract import AbstractCStruct

cstruct/mem_cstruct.py

@@ -22,9 +22,10 @@
 # IN THE SOFTWARE.
 #
 
-from typing import Any, List, Optional
 import ctypes
 import struct
+from typing import Any, List, Optional
+
 from .abstract import AbstractCStruct