Remove temporary I252 ignore on pyteal.ast.abi

.flake8

@@ -25,9 +25,6 @@ per-file-ignores =
     pyteal/ir/ops.py:                               E221
     tests/module_test.py:                           F401, F403
     tests/*.py:                                     I252
-    # Temporarily ignore until merge completes
-    pyteal/ast/abi/*.py:			    I252
-    # End temporarty ignore
 
 # from flake8-tidy-imports
 ban-relative-imports = true

pyteal/ast/abi/__init__.py

@@ -1,8 +1,8 @@
-from .string import String, StringTypeSpec
-from .address import AddressTypeSpec, Address, ADDRESS_LENGTH
-from .type import TypeSpec, BaseType, ComputedValue
-from .bool import BoolTypeSpec, Bool
-from .uint import (
+from pyteal.ast.abi.string import String, StringTypeSpec
+from pyteal.ast.abi.address import AddressTypeSpec, Address, ADDRESS_LENGTH
+from pyteal.ast.abi.type import TypeSpec, BaseType, ComputedValue
+from pyteal.ast.abi.bool import BoolTypeSpec, Bool
+from pyteal.ast.abi.uint import (
     UintTypeSpec,
     Uint,
     ByteTypeSpec,
@@ -16,7 +16,7 @@
     Uint64TypeSpec,
     Uint64,
 )
-from .tuple import (
+from pyteal.ast.abi.tuple import (
     TupleTypeSpec,
     Tuple,
     TupleElement,
@@ -27,11 +27,11 @@
     Tuple4,
     Tuple5,
 )
-from .array_base import ArrayTypeSpec, Array, ArrayElement
-from .array_static import StaticArrayTypeSpec, StaticArray
-from .array_dynamic import DynamicArrayTypeSpec, DynamicArray
-from .util import type_spec_from_annotation
-from .method_return import MethodReturn
+from pyteal.ast.abi.array_base import ArrayTypeSpec, Array, ArrayElement
+from pyteal.ast.abi.array_static import StaticArrayTypeSpec, StaticArray
+from pyteal.ast.abi.array_dynamic import DynamicArrayTypeSpec, DynamicArray
+from pyteal.ast.abi.util import type_spec_from_annotation
+from pyteal.ast.abi.method_return import MethodReturn
 
 __all__ = [
     "String",

pyteal/ast/abi/address.py

@@ -1,6 +1,6 @@
-from .array_static import StaticArray, StaticArrayTypeSpec
-from .uint import ByteTypeSpec
-from ..expr import Expr
+from pyteal.ast.abi.array_static import StaticArray, StaticArrayTypeSpec
+from pyteal.ast.abi.uint import ByteTypeSpec
+from pyteal.ast.expr import Expr
 
 ADDRESS_LENGTH = 32
 

pyteal/ast/abi/array_base.py

@@ -8,21 +8,21 @@
 )
 from abc import abstractmethod
 
-from ...types import TealType, require_type
-from ...errors import TealInputError
-from ..expr import Expr
-from ..seq import Seq
-from ..int import Int
-from ..if_ import If
-from ..unaryexpr import Len
-from ..binaryexpr import ExtractUint16
-from ..naryexpr import Concat
-
-from .type import TypeSpec, BaseType, ComputedValue
-from .tuple import encodeTuple
-from .bool import Bool, BoolTypeSpec
-from .uint import Uint16, Uint16TypeSpec
-from .util import substringForDecoding
+from pyteal.types import TealType, require_type
+from pyteal.errors import TealInputError
+from pyteal.ast.expr import Expr
+from pyteal.ast.seq import Seq
+from pyteal.ast.int import Int
+from pyteal.ast.if_ import If
+from pyteal.ast.unaryexpr import Len
+from pyteal.ast.binaryexpr import ExtractUint16
+from pyteal.ast.naryexpr import Concat
+
+from pyteal.ast.abi.type import TypeSpec, BaseType, ComputedValue
+from pyteal.ast.abi.tuple import encodeTuple
+from pyteal.ast.abi.bool import Bool, BoolTypeSpec
+from pyteal.ast.abi.uint import Uint16, Uint16TypeSpec
+from pyteal.ast.abi.util import substringForDecoding
 
 T = TypeVar("T", bound=BaseType)
 

pyteal/ast/abi/array_dynamic.py

@@ -6,13 +6,13 @@
 )
 
 
-from ...errors import TealInputError
-from ..expr import Expr
-from ..seq import Seq
+from pyteal.errors import TealInputError
+from pyteal.ast.expr import Expr
+from pyteal.ast.seq import Seq
 
-from .type import ComputedValue, TypeSpec, BaseType
-from .uint import Uint16
-from .array_base import ArrayTypeSpec, Array
+from pyteal.ast.abi.type import ComputedValue, TypeSpec, BaseType
+from pyteal.ast.abi.uint import Uint16
+from pyteal.ast.abi.array_base import ArrayTypeSpec, Array
 
 
 T = TypeVar("T", bound=BaseType)

pyteal/ast/abi/array_dynamic_test.py

@@ -3,10 +3,10 @@
 
 import pyteal as pt
 from pyteal import abi
-from .util import substringForDecoding
-from .tuple import encodeTuple
-from .array_base_test import STATIC_TYPES, DYNAMIC_TYPES
-from .type_test import ContainerType
+from pyteal.ast.abi.util import substringForDecoding
+from pyteal.ast.abi.tuple import encodeTuple
+from pyteal.ast.abi.array_base_test import STATIC_TYPES, DYNAMIC_TYPES
+from pyteal.ast.abi.type_test import ContainerType
 
 options = pt.CompileOptions(version=5)
 

pyteal/ast/abi/array_static.py

@@ -7,13 +7,13 @@
     cast,
 )
 
-from ...errors import TealInputError
-from ..expr import Expr
-from ..int import Int
+from pyteal.errors import TealInputError
+from pyteal.ast.expr import Expr
+from pyteal.ast.int import Int
 
-from .type import ComputedValue, TypeSpec, BaseType
-from .bool import BoolTypeSpec, boolSequenceLength
-from .array_base import ArrayTypeSpec, Array, ArrayElement
+from pyteal.ast.abi.type import ComputedValue, TypeSpec, BaseType
+from pyteal.ast.abi.bool import BoolTypeSpec, boolSequenceLength
+from pyteal.ast.abi.array_base import ArrayTypeSpec, Array, ArrayElement
 
 
 T = TypeVar("T", bound=BaseType)

pyteal/ast/abi/array_static_test.py

@@ -2,11 +2,11 @@
 
 import pyteal as pt
 from pyteal import abi
-from .util import substringForDecoding
-from .tuple import encodeTuple
-from .bool import boolSequenceLength
-from .type_test import ContainerType
-from .array_base_test import STATIC_TYPES, DYNAMIC_TYPES
+from pyteal.ast.abi.util import substringForDecoding
+from pyteal.ast.abi.tuple import encodeTuple
+from pyteal.ast.abi.bool import boolSequenceLength
+from pyteal.ast.abi.type_test import ContainerType
+from pyteal.ast.abi.array_base_test import STATIC_TYPES, DYNAMIC_TYPES
 
 options = pt.CompileOptions(version=5)
 

pyteal/ast/abi/bool.py

@@ -1,16 +1,16 @@
 from typing import TypeVar, Union, cast, Sequence, Callable
 
-from ...types import TealType
-from ...errors import TealInputError
-from ..expr import Expr
-from ..seq import Seq
-from ..assert_ import Assert
-from ..int import Int
-from ..bytes import Bytes
-from ..binaryexpr import GetBit
-from ..ternaryexpr import SetBit
-from .type import ComputedValue, TypeSpec, BaseType
-from .uint import NUM_BITS_IN_BYTE
+from pyteal.types import TealType
+from pyteal.errors import TealInputError
+from pyteal.ast.expr import Expr
+from pyteal.ast.seq import Seq
+from pyteal.ast.assert_ import Assert
+from pyteal.ast.int import Int
+from pyteal.ast.bytes import Bytes
+from pyteal.ast.binaryexpr import GetBit
+from pyteal.ast.ternaryexpr import SetBit
+from pyteal.ast.abi.type import ComputedValue, TypeSpec, BaseType
+from pyteal.ast.abi.uint import NUM_BITS_IN_BYTE
 
 
 class BoolTypeSpec(TypeSpec):

pyteal/ast/abi/bool_test.py

@@ -3,8 +3,8 @@
 
 import pyteal as pt
 from pyteal import abi
-from .type_test import ContainerType
-from .bool import (
+from pyteal.ast.abi.type_test import ContainerType
+from pyteal.ast.abi.bool import (
     boolAwareStaticByteLength,
     consecutiveBoolInstanceNum,
     consecutiveBoolTypeSpecNum,

pyteal/ast/abi/method_return.py

@@ -1,13 +1,13 @@
 from typing import TYPE_CHECKING, Tuple
-from . import BaseType
-from ...types import TealType
-from ...errors import TealInputError
-from .. import Expr, Log, Concat, Bytes
-from ...ir import TealBlock, TealSimpleBlock, Op
-from ...config import RETURN_METHOD_SELECTOR
+from pyteal.ast.abi import BaseType
+from pyteal.types import TealType
+from pyteal.errors import TealInputError
+from pyteal.ast import Expr, Log, Concat, Bytes
+from pyteal.ir import TealBlock, TealSimpleBlock, Op
+from pyteal.config import RETURN_METHOD_SELECTOR
 
 if TYPE_CHECKING:
-    from ...compiler import CompileOptions
+    from pyteal.compiler import CompileOptions
 
 
 class MethodReturn(Expr):

pyteal/ast/abi/string.py

@@ -1,9 +1,9 @@
-from .array_dynamic import DynamicArray, DynamicArrayTypeSpec
-from .uint import ByteTypeSpec, Uint16TypeSpec
-from .util import substringForDecoding
+from pyteal.ast.abi.array_dynamic import DynamicArray, DynamicArrayTypeSpec
+from pyteal.ast.abi.uint import ByteTypeSpec, Uint16TypeSpec
+from pyteal.ast.abi.util import substringForDecoding
 
-from ..int import Int
-from ..expr import Expr
+from pyteal.ast.int import Int
+from pyteal.ast.expr import Expr
 
 
 class StringTypeSpec(DynamicArrayTypeSpec):

pyteal/ast/abi/tuple.py

@@ -8,19 +8,19 @@
     overload,
 )
 
-from ...types import TealType
-from ...errors import TealInputError
-from ..expr import Expr
-from ..seq import Seq
-from ..int import Int
-from ..bytes import Bytes
-from ..unaryexpr import Len
-from ..binaryexpr import ExtractUint16
-from ..naryexpr import Concat
-from ..scratchvar import ScratchVar
-
-from .type import TypeSpec, BaseType, ComputedValue
-from .bool import (
+from pyteal.types import TealType
+from pyteal.errors import TealInputError
+from pyteal.ast.expr import Expr
+from pyteal.ast.seq import Seq
+from pyteal.ast.int import Int
+from pyteal.ast.bytes import Bytes
+from pyteal.ast.unaryexpr import Len
+from pyteal.ast.binaryexpr import ExtractUint16
+from pyteal.ast.naryexpr import Concat
+from pyteal.ast.scratchvar import ScratchVar
+
+from pyteal.ast.abi.type import TypeSpec, BaseType, ComputedValue
+from pyteal.ast.abi.bool import (
     Bool,
     BoolTypeSpec,
     consecutiveBoolInstanceNum,
@@ -29,8 +29,8 @@
     encodeBoolSequence,
     boolAwareStaticByteLength,
 )
-from .uint import NUM_BITS_IN_BYTE, Uint16
-from .util import substringForDecoding
+from pyteal.ast.abi.uint import NUM_BITS_IN_BYTE, Uint16
+from pyteal.ast.abi.util import substringForDecoding
 
 
 def encodeTuple(values: Sequence[BaseType]) -> Expr:

pyteal/ast/abi/tuple_test.py

@@ -3,10 +3,10 @@
 
 import pyteal as pt
 from pyteal import abi
-from .tuple import encodeTuple, indexTuple, TupleElement
-from .bool import encodeBoolSequence
-from .util import substringForDecoding
-from .type_test import ContainerType
+from pyteal.ast.abi.tuple import encodeTuple, indexTuple, TupleElement
+from pyteal.ast.abi.bool import encodeBoolSequence
+from pyteal.ast.abi.util import substringForDecoding
+from pyteal.ast.abi.type_test import ContainerType
 
 options = pt.CompileOptions(version=5)
 

pyteal/ast/abi/type.py

@@ -1,11 +1,11 @@
 from typing import TypeVar, Generic, Callable, Final, cast
 from abc import ABC, abstractmethod
 
-from ...errors import TealInputError
-from ...types import TealType
-from ..expr import Expr
-from ..scratchvar import ScratchVar
-from ..seq import Seq
+from pyteal.errors import TealInputError
+from pyteal.types import TealType
+from pyteal.ast.expr import Expr
+from pyteal.ast.scratchvar import ScratchVar
+from pyteal.ast.seq import Seq
 
 
 class TypeSpec(ABC):

pyteal/ast/abi/uint.py

@@ -7,19 +7,19 @@
 )
 from abc import abstractmethod
 
-from ...types import TealType
-from ...errors import TealInputError
-from ..scratchvar import ScratchVar
-from ..expr import Expr
-from ..seq import Seq
-from ..assert_ import Assert
-from ..substring import Suffix
-from ..int import Int
-from ..bytes import Bytes
-from ..unaryexpr import Itob, Btoi
-from ..binaryexpr import GetByte, ExtractUint16, ExtractUint32, ExtractUint64
-from ..ternaryexpr import SetByte
-from .type import ComputedValue, TypeSpec, BaseType
+from pyteal.types import TealType
+from pyteal.errors import TealInputError
+from pyteal.ast.scratchvar import ScratchVar
+from pyteal.ast.expr import Expr
+from pyteal.ast.seq import Seq
+from pyteal.ast.assert_ import Assert
+from pyteal.ast.substring import Suffix
+from pyteal.ast.int import Int
+from pyteal.ast.bytes import Bytes
+from pyteal.ast.unaryexpr import Itob, Btoi
+from pyteal.ast.binaryexpr import GetByte, ExtractUint16, ExtractUint32, ExtractUint64
+from pyteal.ast.ternaryexpr import SetByte
+from pyteal.ast.abi.type import ComputedValue, TypeSpec, BaseType
 
 NUM_BITS_IN_BYTE = 8
 

pyteal/ast/abi/uint_test.py

@@ -1,5 +1,5 @@
 from typing import List, Tuple, NamedTuple, Callable, Union, Optional
-from .type_test import ContainerType
+from pyteal.ast.abi.type_test import ContainerType
 import pyteal as pt
 from pyteal import abi