removed-typehints-and-imports

khubaibalam2000 · khubaibalam2000 · commit b4e40e32428f · 2023-09-20T22:28:23.000+05:00
diff --git a/src/dynamodb_encryption_sdk/delegated_keys/__init__.py b/src/dynamodb_encryption_sdk/delegated_keys/__init__.py
@@ -17,11 +17,7 @@
 
 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
+from typing import Dict, Optional, Text
 
 
 __all__ = ("DelegatedKey",)
diff --git a/src/dynamodb_encryption_sdk/delegated_keys/jce.py b/src/dynamodb_encryption_sdk/delegated_keys/jce.py
@@ -28,11 +28,7 @@
 
 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
+from typing import Dict, Optional, Text
 
 
 __all__ = ("JceNameLocalDelegatedKey",)
diff --git a/src/dynamodb_encryption_sdk/encrypted/__init__.py b/src/dynamodb_encryption_sdk/encrypted/__init__.py
@@ -21,11 +21,7 @@
 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
+from typing import Dict
 
 
 __all__ = ("CryptoConfig",)
diff --git a/src/dynamodb_encryption_sdk/encrypted/client.py b/src/dynamodb_encryption_sdk/encrypted/client.py
@@ -34,11 +34,7 @@
 
 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
+from typing import Any, Callable, Dict, Iterator, Optional
 
 
 __all__ = ("EncryptedClient", "EncryptedPaginator")
diff --git a/src/dynamodb_encryption_sdk/encrypted/item.py b/src/dynamodb_encryption_sdk/encrypted/item.py
@@ -11,11 +11,7 @@
 # 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.internal import dynamodb_types
 
 from dynamodb_encryption_sdk.exceptions import DecryptionError, EncryptionError
 from dynamodb_encryption_sdk.identifiers import CryptoAction
@@ -34,6 +30,7 @@
 
 from . import CryptoConfig  # noqa pylint: disable=unused-import
 
+
 __all__ = ("encrypt_dynamodb_item", "encrypt_python_item", "decrypt_dynamodb_item", "decrypt_python_item")
 
 
diff --git a/src/dynamodb_encryption_sdk/encrypted/resource.py b/src/dynamodb_encryption_sdk/encrypted/resource.py
@@ -29,11 +29,7 @@
 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
+from typing import Optional
 
 
 __all__ = ("EncryptedResource", "EncryptedTablesCollectionManager")
diff --git a/src/dynamodb_encryption_sdk/encrypted/table.py b/src/dynamodb_encryption_sdk/encrypted/table.py
@@ -30,11 +30,7 @@
 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
+from typing import Optional
 
 
 __all__ = ("EncryptedTable",)
diff --git a/src/dynamodb_encryption_sdk/internal/crypto/authentication.py b/src/dynamodb_encryption_sdk/internal/crypto/authentication.py
@@ -26,13 +26,9 @@
 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 typing import Text
 
-    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.internal import dynamodb_types
 
 
 __all__ = ("sign_item", "verify_item_signature")
diff --git a/src/dynamodb_encryption_sdk/internal/crypto/encryption.py b/src/dynamodb_encryption_sdk/internal/crypto/encryption.py
@@ -16,19 +16,17 @@
     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.internal import dynamodb_types
 
 from dynamodb_encryption_sdk.delegated_keys import DelegatedKey  # noqa pylint: disable=unused-import
 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
 
+
 __all__ = ("encrypt_attribute", "decrypt_attribute")
 
 
diff --git a/src/dynamodb_encryption_sdk/internal/crypto/jce_bridge/authentication.py b/src/dynamodb_encryption_sdk/internal/crypto/jce_bridge/authentication.py
@@ -32,11 +32,8 @@
 
 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
+from typing import Any, Callable, Text
+
 
 __all__ = ("JavaAuthenticator", "JavaMac", "JavaSignature", "JAVA_AUTHENTICATOR")
 _LOGGER = logging.getLogger(LOGGER_NAME)
diff --git a/src/dynamodb_encryption_sdk/internal/crypto/jce_bridge/primitives.py b/src/dynamodb_encryption_sdk/internal/crypto/jce_bridge/primitives.py
@@ -38,11 +38,7 @@
 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
+from typing import Any, Callable, Text
 
 
 __all__ = (
diff --git a/src/dynamodb_encryption_sdk/internal/dynamodb_types.py b/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]
diff --git a/src/dynamodb_encryption_sdk/internal/formatting/deserialize/attribute.py b/src/dynamodb_encryption_sdk/internal/formatting/deserialize/attribute.py
@@ -30,13 +30,9 @@
 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 typing import Callable, Dict, List, Text, Union
 
-    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
+from dynamodb_encryption_sdk.internal import dynamodb_types
 
 
 __all__ = ("deserialize_attribute",)
diff --git a/src/dynamodb_encryption_sdk/internal/formatting/material_description.py b/src/dynamodb_encryption_sdk/internal/formatting/material_description.py
@@ -28,13 +28,8 @@
 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
+from typing import Dict, Text
+from dynamodb_encryption_sdk.internal import dynamodb_types
 
 
 __all__ = ("serialize", "deserialize")
diff --git a/src/dynamodb_encryption_sdk/internal/formatting/serialize/__init__.py b/src/dynamodb_encryption_sdk/internal/formatting/serialize/__init__.py
@@ -18,11 +18,8 @@
 """
 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")
 
diff --git a/src/dynamodb_encryption_sdk/internal/formatting/serialize/attribute.py b/src/dynamodb_encryption_sdk/internal/formatting/serialize/attribute.py
@@ -27,13 +27,9 @@
 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 typing import Callable
 
-    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
+from dynamodb_encryption_sdk.internal import dynamodb_types
 
 
 __all__ = ("serialize_attribute",)
diff --git a/src/dynamodb_encryption_sdk/internal/identifiers.py b/src/dynamodb_encryption_sdk/internal/identifiers.py
@@ -18,11 +18,8 @@
 """
 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",
diff --git a/src/dynamodb_encryption_sdk/internal/utils.py b/src/dynamodb_encryption_sdk/internal/utils.py
@@ -28,11 +28,8 @@
 from dynamodb_encryption_sdk.structures import CryptoAction, EncryptionContext, TableInfo
 from dynamodb_encryption_sdk.transform import dict_to_ddb
 
-try:  # Python 3.5.0 and 3.5.1 have incompatible typing modules
-    from typing import Any, Bool, Callable, Dict, Iterable, 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 Any, Bool, Callable, Dict, Iterable, Text
+
 
 __all__ = (
     "TableInfoCache",
diff --git a/src/dynamodb_encryption_sdk/material_providers/aws_kms.py b/src/dynamodb_encryption_sdk/material_providers/aws_kms.py
@@ -36,13 +36,8 @@
 
 from . import CryptographicMaterialsProvider
 
-try:  # Python 3.5.0 and 3.5.1 have incompatible typing modules
-    from typing import Dict, Optional, Text, Tuple  # 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 Dict, Optional, Text, Tuple
+from dynamodb_encryption_sdk.internal import dynamodb_types
 
 
 __all__ = ("AwsKmsCryptographicMaterialsProvider",)
diff --git a/src/dynamodb_encryption_sdk/material_providers/most_recent.py b/src/dynamodb_encryption_sdk/material_providers/most_recent.py
@@ -28,11 +28,7 @@
 from . import CryptographicMaterialsProvider
 from .store import ProviderStore
 
-try:  # Python 3.5.0 and 3.5.1 have incompatible typing modules
-    from typing import Any, 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 Any, Text
 
 
 __all__ = ("CachingMostRecentProvider",)
diff --git a/src/dynamodb_encryption_sdk/material_providers/static.py b/src/dynamodb_encryption_sdk/material_providers/static.py
@@ -19,11 +19,7 @@
 
 from . import CryptographicMaterialsProvider
 
-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
+from typing import Optional
 
 
 __all__ = ("StaticCryptographicMaterialsProvider",)
diff --git a/src/dynamodb_encryption_sdk/material_providers/store/__init__.py b/src/dynamodb_encryption_sdk/material_providers/store/__init__.py
@@ -19,12 +19,7 @@
 from dynamodb_encryption_sdk.material_providers import (  # noqa pylint: disable=unused-import
     CryptographicMaterialsProvider,
 )
-
-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
+from typing import Dict, Optional, Text
 
 
 __all__ = ("ProviderStore",)
diff --git a/src/dynamodb_encryption_sdk/material_providers/store/meta.py b/src/dynamodb_encryption_sdk/material_providers/store/meta.py
@@ -29,11 +29,7 @@
 
 from . import ProviderStore
 
-try:  # Python 3.5.0 and 3.5.1 have incompatible typing modules
-    from typing import Dict, Optional, Text, Tuple  # 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 Dict, Optional, Text, Tuple
 
 
 __all__ = ("MetaStore",)
diff --git a/src/dynamodb_encryption_sdk/material_providers/wrapped.py b/src/dynamodb_encryption_sdk/material_providers/wrapped.py
@@ -22,17 +22,7 @@
 
 from . import CryptographicMaterialsProvider
 
-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
-
-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
+from typing import Dict, Optional, Text
 
 
 __all__ = ("WrappedCryptographicMaterialsProvider",)
diff --git a/src/dynamodb_encryption_sdk/materials/__init__.py b/src/dynamodb_encryption_sdk/materials/__init__.py
diff --git a/src/dynamodb_encryption_sdk/materials/raw.py b/src/dynamodb_encryption_sdk/materials/raw.py
diff --git a/src/dynamodb_encryption_sdk/materials/wrapped.py b/src/dynamodb_encryption_sdk/materials/wrapped.py
diff --git a/src/dynamodb_encryption_sdk/transform.py b/src/dynamodb_encryption_sdk/transform.py
