diff --git a/cppwg/generators.py b/cppwg/generators.py index 6ea402b..b1ead36 100644 --- a/cppwg/generators.py +++ b/cppwg/generators.py @@ -1,9 +1,8 @@ -import os -import re import fnmatch import logging +import os +import re import subprocess - from pathlib import Path from typing import List, Optional @@ -14,16 +13,12 @@ from cppwg.input.free_function_info import CppFreeFunctionInfo from cppwg.input.info_helper import CppInfoHelper from cppwg.input.package_info import PackageInfo - from cppwg.parsers.package_info import PackageInfoParser from cppwg.parsers.source_parser import CppSourceParser - -from cppwg.writers.header_collection_writer import CppHeaderCollectionWriter -from cppwg.writers.module_writer import CppModuleWrapperWriter - from cppwg.templates import pybind11_default as wrapper_templates - from cppwg.utils.constants import CPPWG_EXT, CPPWG_HEADER_COLLECTION_FILENAME +from cppwg.writers.header_collection_writer import CppHeaderCollectionWriter +from cppwg.writers.module_writer import CppModuleWrapperWriter class CppWrapperGenerator: diff --git a/cppwg/input/cpp_type_info.py b/cppwg/input/cpp_type_info.py index 3d675f3..202c3a1 100644 --- a/cppwg/input/cpp_type_info.py +++ b/cppwg/input/cpp_type_info.py @@ -1,9 +1,9 @@ from typing import Any, Dict, List, Optional -from cppwg.input.base_info import BaseInfo - from pygccxml.declarations import declaration_t +from cppwg.input.base_info import BaseInfo + class CppTypeInfo(BaseInfo): """ diff --git a/cppwg/input/info_helper.py b/cppwg/input/info_helper.py index 52238db..d62a0b6 100644 --- a/cppwg/input/info_helper.py +++ b/cppwg/input/info_helper.py @@ -1,7 +1,6 @@ +import logging import os import re -import logging - from typing import Any, Dict, List from cppwg.input.base_info import BaseInfo diff --git a/cppwg/input/module_info.py b/cppwg/input/module_info.py index 85d6520..93dc1bd 100644 --- a/cppwg/input/module_info.py +++ b/cppwg/input/module_info.py @@ -1,11 +1,10 @@ import os - from typing import Any, Dict, List, Optional -from cppwg.input.base_info import BaseInfo - from pygccxml.declarations import declaration_t +from cppwg.input.base_info import BaseInfo + class ModuleInfo(BaseInfo): """ diff --git a/cppwg/parsers/package_info.py b/cppwg/parsers/package_info.py index eb80bbc..5adc887 100644 --- a/cppwg/parsers/package_info.py +++ b/cppwg/parsers/package_info.py @@ -1,19 +1,17 @@ -import os import importlib.util import logging +import os import sys -import yaml - from typing import Any, Dict, Optional -import cppwg.templates.custom +import yaml +import cppwg.templates.custom from cppwg.input.base_info import BaseInfo from cppwg.input.class_info import CppClassInfo from cppwg.input.free_function_info import CppFreeFunctionInfo from cppwg.input.module_info import ModuleInfo from cppwg.input.package_info import PackageInfo - from cppwg.utils import utils from cppwg.utils.constants import CPPWG_SOURCEROOT_STRING diff --git a/cppwg/parsers/source_parser.py b/cppwg/parsers/source_parser.py index 4f263b9..7e36ce9 100644 --- a/cppwg/parsers/source_parser.py +++ b/cppwg/parsers/source_parser.py @@ -1,11 +1,11 @@ import logging - from pathlib import Path from typing import List, Optional -from pygccxml import parser, declarations - +from pygccxml import declarations, parser from pygccxml.declarations import declaration_t +from pygccxml.declarations.mdecl_wrapper import mdecl_wrapper_t +from pygccxml.declarations.namespace import namespace_t # declaration_t is the base type for all declarations in pygccxml including: # - class_declaration_t (pygccxml.declarations.class_declaration.class_declaration_t) @@ -19,8 +19,6 @@ # - typedef_t (pygccxml.declarations.typedef.typedef_t) # - variable_t (pygccxml.declarations.variable.variable_t) -from pygccxml.declarations.mdecl_wrapper import mdecl_wrapper_t -from pygccxml.declarations.namespace import namespace_t class CppSourceParser: diff --git a/cppwg/utils/utils.py b/cppwg/utils/utils.py index b568112..7eaef6e 100644 --- a/cppwg/utils/utils.py +++ b/cppwg/utils/utils.py @@ -4,8 +4,11 @@ from typing import Any, Dict -from cppwg.utils.constants import CPPWG_ALL_STRING -from cppwg.utils.constants import CPPWG_TRUE_STRINGS, CPPWG_FALSE_STRINGS +from cppwg.utils.constants import ( + CPPWG_ALL_STRING, + CPPWG_FALSE_STRINGS, + CPPWG_TRUE_STRINGS, +) def is_option_ALL(input_obj: Any, option_ALL_string: str = CPPWG_ALL_STRING) -> bool: diff --git a/cppwg/writers/class_writer.py b/cppwg/writers/class_writer.py index e42570f..0d30636 100644 --- a/cppwg/writers/class_writer.py +++ b/cppwg/writers/class_writer.py @@ -1,6 +1,5 @@ -import os import logging - +import os from typing import Dict, List from pygccxml import declarations @@ -8,12 +7,10 @@ from pygccxml.declarations.class_declaration import class_t from cppwg.input.class_info import CppClassInfo - +from cppwg.utils.constants import CPPWG_EXT, CPPWG_HEADER_COLLECTION_FILENAME from cppwg.writers.base_writer import CppBaseWrapperWriter -from cppwg.writers.method_writer import CppMethodWrapperWriter from cppwg.writers.constructor_writer import CppConstructorWrapperWriter - -from cppwg.utils.constants import CPPWG_EXT, CPPWG_HEADER_COLLECTION_FILENAME +from cppwg.writers.method_writer import CppMethodWrapperWriter class CppClassWrapperWriter(CppBaseWrapperWriter): diff --git a/cppwg/writers/constructor_writer.py b/cppwg/writers/constructor_writer.py index 8f2f94f..1888daf 100644 --- a/cppwg/writers/constructor_writer.py +++ b/cppwg/writers/constructor_writer.py @@ -1,8 +1,8 @@ from typing import Dict, Optional from pygccxml import declarations -from pygccxml.declarations.class_declaration import class_t from pygccxml.declarations.calldef_members import constructor_t +from pygccxml.declarations.class_declaration import class_t from cppwg.input.class_info import CppClassInfo from cppwg.writers.base_writer import CppBaseWrapperWriter diff --git a/cppwg/writers/free_function_writer.py b/cppwg/writers/free_function_writer.py index 806066f..b5f97ab 100644 --- a/cppwg/writers/free_function_writer.py +++ b/cppwg/writers/free_function_writer.py @@ -1,7 +1,6 @@ from typing import Dict, List from cppwg.input.free_function_info import CppFreeFunctionInfo - from cppwg.writers.base_writer import CppBaseWrapperWriter diff --git a/cppwg/writers/header_collection_writer.py b/cppwg/writers/header_collection_writer.py index 2a3f3cd..c795307 100644 --- a/cppwg/writers/header_collection_writer.py +++ b/cppwg/writers/header_collection_writer.py @@ -1,5 +1,4 @@ import os - from typing import Dict from cppwg.input.class_info import CppClassInfo diff --git a/cppwg/writers/method_writer.py b/cppwg/writers/method_writer.py index 9cb3671..386b31a 100644 --- a/cppwg/writers/method_writer.py +++ b/cppwg/writers/method_writer.py @@ -1,8 +1,8 @@ from typing import Dict, Optional from pygccxml import declarations -from pygccxml.declarations.class_declaration import class_t from pygccxml.declarations.calldef_members import member_function_t +from pygccxml.declarations.class_declaration import class_t from cppwg.input.class_info import CppClassInfo from cppwg.writers.base_writer import CppBaseWrapperWriter diff --git a/cppwg/writers/module_writer.py b/cppwg/writers/module_writer.py index c0e6f71..cb3091b 100644 --- a/cppwg/writers/module_writer.py +++ b/cppwg/writers/module_writer.py @@ -1,18 +1,14 @@ -import os import logging - +import os from typing import Dict, List from pygccxml.declarations.class_declaration import class_t from pygccxml.declarations.namespace import namespace_t from cppwg.input.module_info import ModuleInfo - -from cppwg.writers.free_function_writer import CppFreeFunctionWrapperWriter +from cppwg.utils.constants import CPPWG_EXT, CPPWG_HEADER_COLLECTION_FILENAME from cppwg.writers.class_writer import CppClassWrapperWriter - -from cppwg.utils.constants import CPPWG_EXT -from cppwg.utils.constants import CPPWG_HEADER_COLLECTION_FILENAME +from cppwg.writers.free_function_writer import CppFreeFunctionWrapperWriter class CppModuleWrapperWriter: diff --git a/tests/test_shapes.py b/tests/test_shapes.py index f9e10bf..49d205c 100644 --- a/tests/test_shapes.py +++ b/tests/test_shapes.py @@ -1,7 +1,6 @@ import os import subprocess import unittest - from typing import List