refactor: typehints and imports compatible to Python3.7 (#740)

Author: khubaibalam2000

src/dynamodb_encryption_sdk/delegated_keys/__init__.py

@@ -12,18 +12,12 @@
 # language governing permissions and limitations under the License.
 """Delegated keys."""
 import abc
+from typing import Dict, Optional, Text
 
 import six
 
 from dynamodb_encryption_sdk.identifiers import EncryptionKeyType  # noqa pylint: disable=unused-import
 
-try:  # Python 3.5.0 and 3.5.1 have incompatible typing modules
-    from typing import Dict, Optional, Text  # noqa pylint: disable=unused-import
-except ImportError:  # pragma: no cover
-    # We only actually need these imports when running the mypy checks
-    pass
-
-
 __all__ = ("DelegatedKey",)
 
 

src/dynamodb_encryption_sdk/delegated_keys/jce.py

@@ -15,6 +15,7 @@
 
 import logging
 import os
+from typing import Dict, Optional, Text
 
 import attr
 import six
@@ -28,13 +29,6 @@
 
 from . import DelegatedKey
 
-try:  # Python 3.5.0 and 3.5.1 have incompatible typing modules
-    from typing import Dict, Optional, Text  # noqa pylint: disable=unused-import
-except ImportError:  # pragma: no cover
-    # We only actually need these imports when running the mypy checks
-    pass
-
-
 __all__ = ("JceNameLocalDelegatedKey",)
 _LOGGER = logging.getLogger(LOGGER_NAME)
 

src/dynamodb_encryption_sdk/encrypted/__init__.py

@@ -21,13 +21,6 @@
 from dynamodb_encryption_sdk.materials import CryptographicMaterials  # noqa pylint: disable=unused-import
 from dynamodb_encryption_sdk.structures import AttributeActions, EncryptionContext
 
-try:  # Python 3.5.0 and 3.5.1 have incompatible typing modules
-    from typing import Dict  # noqa pylint: disable=unused-import
-except ImportError:  # pragma: no cover
-    # We only actually need these imports when running the mypy checks
-    pass
-
-
 __all__ = ("CryptoConfig",)
 
 

src/dynamodb_encryption_sdk/encrypted/client.py

@@ -12,6 +12,7 @@
 # language governing permissions and limitations under the License.
 """High-level helper class to provide a familiar interface to encrypted tables."""
 from functools import partial
+from typing import Any, Callable, Dict, Iterator, Optional
 
 import attr
 import botocore
@@ -34,13 +35,6 @@
 
 from .item import decrypt_dynamodb_item, decrypt_python_item, encrypt_dynamodb_item, encrypt_python_item
 
-try:  # Python 3.5.0 and 3.5.1 have incompatible typing modules
-    from typing import Any, Callable, Dict, Iterator, Optional  # noqa pylint: disable=unused-import
-except ImportError:  # pragma: no cover
-    # We only actually need these imports when running the mypy checks
-    pass
-
-
 __all__ = ("EncryptedClient", "EncryptedPaginator")
 
 

src/dynamodb_encryption_sdk/encrypted/item.py

@@ -11,14 +11,9 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 """Top-level functions for encrypting and decrypting DynamoDB items."""
-try:  # Python 3.5.0 and 3.5.1 have incompatible typing modules
-    from dynamodb_encryption_sdk.internal import dynamodb_types  # noqa pylint: disable=unused-import
-except ImportError:  # pragma: no cover
-    # We only actually need these imports when running the mypy checks
-    pass
-
 from dynamodb_encryption_sdk.exceptions import DecryptionError, EncryptionError
 from dynamodb_encryption_sdk.identifiers import CryptoAction
+from dynamodb_encryption_sdk.internal import dynamodb_types
 from dynamodb_encryption_sdk.internal.crypto.authentication import sign_item, verify_item_signature
 from dynamodb_encryption_sdk.internal.crypto.encryption import decrypt_attribute, encrypt_attribute
 from dynamodb_encryption_sdk.internal.formatting.material_description import (

src/dynamodb_encryption_sdk/encrypted/resource.py

@@ -12,6 +12,7 @@
 # language governing permissions and limitations under the License.
 """High-level helper class to provide a familiar interface to encrypted tables."""
 from functools import partial
+from typing import Optional
 
 import attr
 from boto3.resources.base import ServiceResource
@@ -29,13 +30,6 @@
 from .item import decrypt_python_item, encrypt_python_item
 from .table import EncryptedTable
 
-try:  # Python 3.5.0 and 3.5.1 have incompatible typing modules
-    from typing import Optional  # noqa pylint: disable=unused-import
-except ImportError:  # pragma: no cover
-    # We only actually need these imports when running the mypy checks
-    pass
-
-
 __all__ = ("EncryptedResource", "EncryptedTablesCollectionManager")
 
 

src/dynamodb_encryption_sdk/encrypted/table.py

@@ -12,6 +12,7 @@
 # language governing permissions and limitations under the License.
 """High-level helper class to provide a familiar interface to encrypted tables."""
 from functools import partial
+from typing import Optional
 
 import attr
 from boto3.dynamodb.table import BatchWriter
@@ -30,13 +31,6 @@
 from .client import EncryptedClient
 from .item import decrypt_python_item, encrypt_python_item
 
-try:  # Python 3.5.0 and 3.5.1 have incompatible typing modules
-    from typing import Optional  # noqa pylint: disable=unused-import
-except ImportError:  # pragma: no cover
-    # We only actually need these imports when running the mypy checks
-    pass
-
-
 __all__ = ("EncryptedTable",)
 
 

src/dynamodb_encryption_sdk/internal/crypto/authentication.py

@@ -16,25 +16,19 @@
     No guarantee is provided on the modules and APIs within this
     namespace staying consistent. Directly reference at your own risk.
 """
+from typing import Text
+
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives import hashes
 
 from dynamodb_encryption_sdk.delegated_keys import DelegatedKey  # noqa pylint: disable=unused-import
 from dynamodb_encryption_sdk.encrypted import CryptoConfig  # noqa pylint: disable=unused-import
 from dynamodb_encryption_sdk.identifiers import CryptoAction
+from dynamodb_encryption_sdk.internal import dynamodb_types
 from dynamodb_encryption_sdk.internal.formatting.serialize.attribute import serialize_attribute
 from dynamodb_encryption_sdk.internal.identifiers import TEXT_ENCODING, SignatureValues, Tag
 from dynamodb_encryption_sdk.structures import AttributeActions  # noqa pylint: disable=unused-import
 
-try:  # Python 3.5.0 and 3.5.1 have incompatible typing modules
-    from typing import Text  # noqa pylint: disable=unused-import
-
-    from dynamodb_encryption_sdk.internal import dynamodb_types  # noqa pylint: disable=unused-import
-except ImportError:  # pragma: no cover
-    # We only actually need these imports when running the mypy checks
-    pass
-
-
 __all__ = ("sign_item", "verify_item_signature")
 
 

src/dynamodb_encryption_sdk/internal/crypto/encryption.py

@@ -16,15 +16,11 @@
     No guarantee is provided on the modules and APIs within this
     namespace staying consistent. Directly reference at your own risk.
 """
-try:  # Python 3.5.0 and 3.5.1 have incompatible typing modules
-    from typing import Text  # noqa pylint: disable=unused-import
 
-    from dynamodb_encryption_sdk.internal import dynamodb_types  # noqa pylint: disable=unused-import
-except ImportError:  # pragma: no cover
-    # We only actually need these imports when running the mypy checks
-    pass
+from typing import Text
 
 from dynamodb_encryption_sdk.delegated_keys import DelegatedKey  # noqa pylint: disable=unused-import
+from dynamodb_encryption_sdk.internal import dynamodb_types
 from dynamodb_encryption_sdk.internal.formatting.deserialize.attribute import deserialize_attribute
 from dynamodb_encryption_sdk.internal.formatting.serialize.attribute import serialize_attribute
 from dynamodb_encryption_sdk.internal.identifiers import Tag

src/dynamodb_encryption_sdk/internal/crypto/jce_bridge/authentication.py

@@ -18,6 +18,7 @@
 """
 import abc
 import logging
+from typing import Any, Callable, Text
 
 import attr
 import six
@@ -32,12 +33,6 @@
 
 from .primitives import load_rsa_key
 
-try:  # Python 3.5.0 and 3.5.1 have incompatible typing modules
-    from typing import Any, Callable, Text  # noqa pylint: disable=unused-import
-except ImportError:  # pragma: no cover
-    # We only actually need these imports when running the mypy checks
-    pass
-
 __all__ = ("JavaAuthenticator", "JavaMac", "JavaSignature", "JAVA_AUTHENTICATOR")
 _LOGGER = logging.getLogger(LOGGER_NAME)
 

src/dynamodb_encryption_sdk/internal/crypto/jce_bridge/primitives.py

@@ -19,6 +19,7 @@
 import abc
 import logging
 import os
+from typing import Any, Callable, Text
 
 import attr
 import six
@@ -38,13 +39,6 @@
 from dynamodb_encryption_sdk.internal.identifiers import MinimumKeySizes
 from dynamodb_encryption_sdk.internal.validators import callable_validator
 
-try:  # Python 3.5.0 and 3.5.1 have incompatible typing modules
-    from typing import Any, Callable, Text  # noqa pylint: disable=unused-import
-except ImportError:  # pragma: no cover
-    # We only actually need these imports when running the mypy checks
-    pass
-
-
 __all__ = (
     "JavaPadding",
     "SimplePadding",

src/dynamodb_encryption_sdk/internal/dynamodb_types.py

@@ -5,24 +5,20 @@
     namespace staying consistent. Directly reference at your own risk.
 """
 # constant naming for types so pylint: disable=invalid-name
-try:  # Python 3.5.0 and 3.5.1 have incompatible typing modules
-    from typing import Any, AnyStr, ByteString, Dict, List, Text
+from typing import Any, AnyStr, ByteString, Dict, List, Text
 
-    # https://github.com/aws/aws-dynamodb-encryption-python/issues/66
-    ATTRIBUTE = Dict[Text, Any]  # narrow this down
-    ITEM = Dict[Text, ATTRIBUTE]
-    RAW_ATTRIBUTE = ITEM
-    NULL = bool  # DynamoDB TypeSerializer converts none to {'NULL': True}
-    BOOLEAN = bool
-    # https://github.com/aws/aws-dynamodb-encryption-python/issues/66
-    NUMBER = int  # This misses long on Python 2...figure out something for this
-    # https://github.com/aws/aws-dynamodb-encryption-python/issues/66
-    STRING = AnyStr  # can be unicode but should not be bytes
-    BINARY = ByteString
-    BINARY_ATTRIBUTE = Dict[Text, BINARY]
-    SET = List  # DynamoDB TypeSerializer converts sets into lists
-    MAP = RAW_ATTRIBUTE
-    LIST = List[RAW_ATTRIBUTE]
-except ImportError:  # pragma: no cover
-    # We only actually need these imports when running the mypy checks
-    pass
+# https://github.com/aws/aws-dynamodb-encryption-python/issues/66
+ATTRIBUTE = Dict[Text, Any]  # narrow this down
+ITEM = Dict[Text, ATTRIBUTE]
+RAW_ATTRIBUTE = ITEM
+NULL = bool  # DynamoDB TypeSerializer converts none to {'NULL': True}
+BOOLEAN = bool
+# https://github.com/aws/aws-dynamodb-encryption-python/issues/66
+NUMBER = int  # This misses long on Python 2...figure out something for this
+# https://github.com/aws/aws-dynamodb-encryption-python/issues/66
+STRING = AnyStr  # can be unicode but should not be bytes
+BINARY = ByteString
+BINARY_ATTRIBUTE = Dict[Text, BINARY]
+SET = List  # DynamoDB TypeSerializer converts sets into lists
+MAP = RAW_ATTRIBUTE
+LIST = List[RAW_ATTRIBUTE]

src/dynamodb_encryption_sdk/internal/formatting/deserialize/attribute.py

@@ -21,24 +21,17 @@
 import logging
 import struct
 from decimal import Decimal
+from typing import Callable, Dict, List, Text, Union
 
 from boto3.dynamodb.types import Binary
 
 from dynamodb_encryption_sdk.exceptions import DeserializationError
 from dynamodb_encryption_sdk.identifiers import LOGGER_NAME
+from dynamodb_encryption_sdk.internal import dynamodb_types
 from dynamodb_encryption_sdk.internal.formatting.deserialize import decode_byte, decode_length, decode_tag, decode_value
 from dynamodb_encryption_sdk.internal.identifiers import TEXT_ENCODING, Tag, TagValues
 from dynamodb_encryption_sdk.internal.str_ops import to_str
 
-try:  # Python 3.5.0 and 3.5.1 have incompatible typing modules
-    from typing import Callable, Dict, List, Text, Union  # noqa pylint: disable=unused-import
-
-    from dynamodb_encryption_sdk.internal import dynamodb_types  # noqa pylint: disable=unused-import,ungrouped-imports
-except ImportError:  # pragma: no cover
-    # We only actually need these imports when running the mypy checks
-    pass
-
-
 __all__ = ("deserialize_attribute",)
 _LOGGER = logging.getLogger(LOGGER_NAME)
 

src/dynamodb_encryption_sdk/internal/formatting/material_description.py

@@ -19,24 +19,17 @@
 import io
 import logging
 import struct
+from typing import Dict, Text
 
 from dynamodb_encryption_sdk.exceptions import InvalidMaterialDescriptionError, InvalidMaterialDescriptionVersionError
 from dynamodb_encryption_sdk.identifiers import LOGGER_NAME
+from dynamodb_encryption_sdk.internal import dynamodb_types
 from dynamodb_encryption_sdk.internal.identifiers import Tag
 from dynamodb_encryption_sdk.internal.str_ops import to_bytes, to_str
 
 from .deserialize import decode_value, unpack_value
 from .serialize import encode_value
 
-try:  # Python 3.5.0 and 3.5.1 have incompatible typing modules
-    from typing import Dict, Text  # noqa pylint: disable=unused-import
-
-    from dynamodb_encryption_sdk.internal import dynamodb_types  # noqa pylint: disable=unused-import
-except ImportError:  # pragma: no cover
-    # We only actually need these imports when running the mypy checks
-    pass
-
-
 __all__ = ("serialize", "deserialize")
 _LOGGER = logging.getLogger(LOGGER_NAME)
 _MATERIAL_DESCRIPTION_VERSION = b"\00" * 4

src/dynamodb_encryption_sdk/internal/formatting/serialize/__init__.py

@@ -17,12 +17,7 @@
     namespace staying consistent. Directly reference at your own risk.
 """
 import struct
-
-try:  # Python 3.5.0 and 3.5.1 have incompatible typing modules
-    from typing import Sized  # noqa pylint: disable=unused-import
-except ImportError:  # pragma: no cover
-    # We only actually need these imports when running the mypy checks
-    pass
+from typing import Sized
 
 __all__ = ("encode_length", "encode_value")
 

src/dynamodb_encryption_sdk/internal/formatting/serialize/attribute.py

@@ -18,24 +18,17 @@
 """
 import io
 import logging
+from typing import Callable
 
 from boto3.dynamodb.types import DYNAMODB_CONTEXT, Binary
 
 from dynamodb_encryption_sdk.exceptions import SerializationError
 from dynamodb_encryption_sdk.identifiers import LOGGER_NAME
+from dynamodb_encryption_sdk.internal import dynamodb_types
 from dynamodb_encryption_sdk.internal.formatting.serialize import encode_length, encode_value
 from dynamodb_encryption_sdk.internal.identifiers import Tag, TagValues
 from dynamodb_encryption_sdk.internal.str_ops import to_bytes
 
-try:  # Python 3.5.0 and 3.5.1 have incompatible typing modules
-    from typing import Callable  # noqa pylint: disable=unused-import
-
-    from dynamodb_encryption_sdk.internal import dynamodb_types  # noqa pylint: disable=unused-import,ungrouped-imports
-except ImportError:  # pragma: no cover
-    # We only actually need these imports when running the mypy checks
-    pass
-
-
 __all__ = ("serialize_attribute",)
 _LOGGER = logging.getLogger(LOGGER_NAME)
 _RESERVED = b"\x00"

src/dynamodb_encryption_sdk/internal/identifiers.py

@@ -17,12 +17,7 @@
     namespace staying consistent. Directly reference at your own risk.
 """
 from enum import Enum
-
-try:  # Python 3.5.0 and 3.5.1 have incompatible typing modules
-    from typing import Optional, Text  # noqa pylint: disable=unused-import
-except ImportError:  # pragma: no cover
-    # We only actually need these imports when running the mypy checks
-    pass
+from typing import Optional, Text
 
 __all__ = (
     "ReservedAttributes",