diff --git a/tivars/models/model.py b/tivars/models/model.py index 6d256a1..d6729f8 100644 --- a/tivars/models/model.py +++ b/tivars/models/model.py @@ -7,9 +7,9 @@ from functools import total_ordering -from ..flags import * -from ..tokens.scripts import OsVersion, Tokens, TokenTrie -from ..tokens.scripts.parse import MODEL_ORDER +from tivars.flags import * +from tivars.tokens.scripts import OsVersion, Tokens, TokenTrie +from tivars.tokens.scripts.parse import MODEL_ORDER @total_ordering diff --git a/tivars/tokenizer/__init__.py b/tivars/tokenizer/__init__.py index 10ae73a..5eb4ac3 100644 --- a/tivars/tokenizer/__init__.py +++ b/tivars/tokenizer/__init__.py @@ -5,9 +5,9 @@ from typing import ByteString -from ..data import String -from ..models import * -from ..tokens.scripts import * +from tivars.data import String +from tivars.models import * +from tivars.tokens.scripts import * def decode(bytestream: ByteString, *, diff --git a/tivars/types/appvar.py b/tivars/types/appvar.py index 83c3297..ac99fcc 100644 --- a/tivars/types/appvar.py +++ b/tivars/types/appvar.py @@ -4,7 +4,7 @@ from tivars.models import * -from ..var import SizedEntry +from tivars.var import SizedEntry class TIAppVar(SizedEntry, register=True): diff --git a/tivars/types/complex.py b/tivars/types/complex.py index f68d4ca..4fc513f 100644 --- a/tivars/types/complex.py +++ b/tivars/types/complex.py @@ -6,10 +6,10 @@ from typing import Type from warnings import warn +from tivars.data import * from tivars.models import * from tivars.numeric import * -from ..data import * -from ..var import TIEntry +from tivars.var import TIEntry from .real import * diff --git a/tivars/types/flash.py b/tivars/types/flash.py index f450618..65eeeb9 100644 --- a/tivars/types/flash.py +++ b/tivars/types/flash.py @@ -1,6 +1,6 @@ -from ..data import * -from ..flash import TIFlashHeader -from ..models import * +from tivars.data import * +from tivars.flash import TIFlashHeader +from tivars.models import * class TIOperatingSystem(TIFlashHeader, register=True): @@ -59,7 +59,7 @@ def calc_data(self) -> bytes: @View(calc_data, String)[:] def license(self) -> str: """ - The license stored in this header + The license stored in the header as a string """ diff --git a/tivars/types/gdb.py b/tivars/types/gdb.py index bbb2666..937564f 100644 --- a/tivars/types/gdb.py +++ b/tivars/types/gdb.py @@ -10,10 +10,10 @@ from typing import Iterator from warnings import catch_warnings, filterwarnings, warn +from tivars.flags import * +from tivars.data import * from tivars.models import * -from ..flags import * -from ..data import * -from ..var import TIEntry, SizedEntry +from tivars.var import TIEntry, SizedEntry from .real import * from .tokenized import TIEquation diff --git a/tivars/types/group.py b/tivars/types/group.py index b84ad32..78a65b9 100644 --- a/tivars/types/group.py +++ b/tivars/types/group.py @@ -8,9 +8,9 @@ from typing import Sequence from warnings import warn +from tivars.data import * from tivars.models import * -from ..data import * -from ..var import TIEntry, SizedEntry +from tivars.var import TIEntry, SizedEntry from .gdb import TIGraphedEquation diff --git a/tivars/types/list.py b/tivars/types/list.py index aba81ef..828b7ee 100644 --- a/tivars/types/list.py +++ b/tivars/types/list.py @@ -9,10 +9,10 @@ from typing import ByteString, Iterator, Sequence from warnings import warn +from tivars.data import * from tivars.models import * -from tivars.tokenizer import TokenizedString -from ..data import * -from ..var import TIEntry +from tivars.tokenizer import * +from tivars.var import TIEntry from .complex import ComplexEntry from .real import RealEntry diff --git a/tivars/types/matrix.py b/tivars/types/matrix.py index af20080..5cb8495 100644 --- a/tivars/types/matrix.py +++ b/tivars/types/matrix.py @@ -7,9 +7,9 @@ from typing import ByteString, Iterator, Sequence from warnings import warn +from tivars.data import * from tivars.models import * -from ..data import * -from ..var import TIEntry +from tivars.var import TIEntry from .real import RealEntry diff --git a/tivars/types/picture.py b/tivars/types/picture.py index 0f50023..5847bdf 100644 --- a/tivars/types/picture.py +++ b/tivars/types/picture.py @@ -6,10 +6,10 @@ from typing import Iterator, Sequence from warnings import warn +from tivars.data import * from tivars.models import * from tivars.tokenizer import TokenizedString -from ..data import * -from ..var import SizedEntry +from tivars.var import SizedEntry RGB = tuple[int, int, int] diff --git a/tivars/types/real.py b/tivars/types/real.py index d26edf3..3dca565 100644 --- a/tivars/types/real.py +++ b/tivars/types/real.py @@ -11,10 +11,10 @@ from typing import Type from warnings import warn +from tivars.data import * from tivars.models import * from tivars.numeric import * -from ..data import * -from ..var import TIEntry +from tivars.var import TIEntry class RealEntry(TIEntry): diff --git a/tivars/types/settings.py b/tivars/types/settings.py index aa7f2c3..01eb427 100644 --- a/tivars/types/settings.py +++ b/tivars/types/settings.py @@ -7,9 +7,9 @@ from warnings import warn +from tivars.data import * from tivars.models import * -from ..data import * -from ..var import SizedEntry +from tivars.var import SizedEntry from .real import GraphRealEntry diff --git a/tivars/types/tokenized.py b/tivars/types/tokenized.py index 50cefb8..a0c2af5 100644 --- a/tivars/types/tokenized.py +++ b/tivars/types/tokenized.py @@ -9,10 +9,10 @@ from typing import ByteString from warnings import warn +from tivars.data import * from tivars.models import * from tivars.tokenizer import * -from ..data import * -from ..var import SizedEntry +from tivars.var import SizedEntry class TokenizedEntry(SizedEntry):