diff --git a/construct_typed/__init__.py b/construct_typed/__init__.py index 00d5093..a11e26d 100644 --- a/construct_typed/__init__.py +++ b/construct_typed/__init__.py @@ -1,4 +1,4 @@ -from .dataclass_struct import ( +from construct_typed.dataclass_struct import ( DataclassBitStruct, DataclassMixin, DataclassStruct, @@ -10,7 +10,7 @@ from .dataclass_struct import ( csfield, sfield, ) -from .generic_wrapper import ( +from construct_typed.generic import ( Adapter, ConstantOrContextLambda, Construct, @@ -18,7 +18,7 @@ from .generic_wrapper import ( ListContainer, PathType, ) -from .tenum import EnumBase, FlagsEnumBase, TEnum, TFlagsEnum +from construct_typed.tenum import EnumBase, FlagsEnumBase, TEnum, TFlagsEnum __all__ = [ "DataclassBitStruct", diff --git a/construct_typed/dataclass_struct.py b/construct_typed/dataclass_struct.py index 78d2e59..5980a82 100644 --- a/construct_typed/dataclass_struct.py +++ b/construct_typed/dataclass_struct.py @@ -12,7 +12,7 @@ from construct.lib.containers import ( ) from construct.lib.py3compat import bytestringtype, reprstring, unicodestringtype -from .generic_wrapper import Adapter, Construct, Context, ParsedType, PathType +from construct_typed.generic import Adapter, Construct, Context, ParsedType, PathType class DataclassMixin: @@ -269,4 +269,4 @@ TBitStruct = DataclassBitStruct TContainerMixin = DataclassMixin TContainerBase = DataclassMixin TStructField = csfield -sfield = csfield \ No newline at end of file +sfield = csfield diff --git a/construct_typed/generic_wrapper.py b/construct_typed/generic.py similarity index 100% rename from construct_typed/generic_wrapper.py rename to construct_typed/generic.py diff --git a/construct_typed/tenum.py b/construct_typed/tenum.py index 7c93e33..91c4173 100644 --- a/construct_typed/tenum.py +++ b/construct_typed/tenum.py @@ -1,7 +1,7 @@ import enum import typing as t -from .generic_wrapper import * +from construct_typed.generic import * # ## TEnum ############################################################################################################ diff --git a/construct_typed/version.py b/construct_typed/version.py index 1a555cf..9498baa 100644 --- a/construct_typed/version.py +++ b/construct_typed/version.py @@ -1,2 +1,2 @@ version = (0, 5, 2) -version_string = "0.5.2" \ No newline at end of file +version_string = "0.5.2"