chore: run isort

Author: josecorella

decrypt_oracle/.chalice/pipeline.py

@@ -2,7 +2,6 @@
 import argparse
 import getpass
 import logging
-from typing import Iterable
 
 import boto3
 import troposphere
@@ -20,6 +19,7 @@
 )
 from botocore.exceptions import ClientError
 from troposphere import GetAtt, Ref, Sub, Template, codebuild, codepipeline, iam, s3
+from typing import Iterable
 
 APPLICATION_NAME = "AwsEncryptionSdkDecryptOraclePython"
 PIPELINE_STACK_NAME = "{}DeployPipeline".format(APPLICATION_NAME)

decrypt_oracle/src/aws_encryption_sdk_decrypt_oracle/app.py

@@ -15,9 +15,10 @@
 import logging
 import os
 
+from chalice import Chalice, Response
+
 import aws_encryption_sdk
 from aws_encryption_sdk.key_providers.kms import DiscoveryAwsKmsMasterKeyProvider
-from chalice import Chalice, Response
 
 from .key_providers.counting import CountingMasterKey
 from .key_providers.null import NullMasterKey

decrypt_oracle/test/integration/integration_test_utils.py

@@ -15,10 +15,11 @@
 import json
 import os
 from collections import namedtuple
+
+import pytest
 from typing import Any, Callable, Iterable, Optional, Text
 
 import aws_encryption_sdk
-import pytest
 from aws_encryption_sdk.identifiers import CommitmentPolicy
 from aws_encryption_sdk.key_providers.kms import StrictAwsKmsMasterKeyProvider
 

decrypt_oracle/test/test_n_generate_test_vectors.py

@@ -15,14 +15,15 @@
 import binascii
 import json
 import os
+
+import pytest
+from aws_encryption_sdk_decrypt_oracle.key_providers.counting import CountingMasterKey
+from aws_encryption_sdk_decrypt_oracle.key_providers.null import NullMasterKey
 from typing import Dict, Iterable, Text
 
 import aws_encryption_sdk
-import pytest
 from aws_encryption_sdk.key_providers.base import MasterKeyProvider
 from aws_encryption_sdk.key_providers.kms import KMSMasterKey
-from aws_encryption_sdk_decrypt_oracle.key_providers.counting import CountingMasterKey
-from aws_encryption_sdk_decrypt_oracle.key_providers.null import NullMasterKey
 
 from .integration.integration_test_utils import test_vectors_filename
 

examples/test/test_i_basic_encryption.py

@@ -17,7 +17,6 @@
 from ..src.basic_encryption import cycle_string
 from .examples_test_utils import get_cmk_arn, static_plaintext
 
-
 pytestmark = [pytest.mark.examples]
 
 

examples/test/test_i_basic_file_encryption_with_multiple_providers.py

@@ -18,9 +18,7 @@
 import pytest
 
 from ..src.basic_file_encryption_with_multiple_providers import cycle_file
-from .examples_test_utils import get_cmk_arn
-from .examples_test_utils import static_plaintext
-
+from .examples_test_utils import get_cmk_arn, static_plaintext
 
 pytestmark = [pytest.mark.examples]
 

examples/test/test_i_basic_file_encryption_with_raw_key_provider.py

@@ -19,7 +19,6 @@
 from ..src.basic_file_encryption_with_raw_key_provider import cycle_file
 from .examples_test_utils import static_plaintext
 
-
 pytestmark = [pytest.mark.examples]
 
 

examples/test/test_i_data_key_caching_basic.py

@@ -16,7 +16,6 @@
 from ..src.data_key_caching_basic import encrypt_with_caching
 from .examples_test_utils import get_cmk_arn
 
-
 pytestmark = [pytest.mark.examples]
 
 

examples/test/test_i_discovery_kms_provider.py

@@ -16,9 +16,7 @@
 import pytest
 
 from ..src.discovery_kms_provider import encrypt_decrypt
-from .examples_test_utils import get_cmk_arn
-from .examples_test_utils import static_plaintext
-
+from .examples_test_utils import get_cmk_arn, static_plaintext
 
 pytestmark = [pytest.mark.examples]
 

examples/test/test_i_multiple_kms_cmk.py

@@ -16,9 +16,7 @@
 import pytest
 
 from ..src.multiple_kms_cmk import encrypt_decrypt
-from .examples_test_utils import get_cmk_arn, get_second_cmk_arn
-from .examples_test_utils import static_plaintext
-
+from .examples_test_utils import get_cmk_arn, get_second_cmk_arn, static_plaintext
 
 pytestmark = [pytest.mark.examples]
 

examples/test/test_i_one_kms_cmk.py

@@ -16,9 +16,7 @@
 import pytest
 
 from ..src.one_kms_cmk import encrypt_decrypt
-from .examples_test_utils import get_cmk_arn
-from .examples_test_utils import static_plaintext
-
+from .examples_test_utils import get_cmk_arn, static_plaintext
 
 pytestmark = [pytest.mark.examples]
 

examples/test/test_i_one_kms_cmk_streaming_data.py

@@ -20,7 +20,6 @@
 from ..src.one_kms_cmk_streaming_data import encrypt_decrypt_stream
 from .examples_test_utils import get_cmk_arn, static_plaintext
 
-
 pytestmark = [pytest.mark.examples]
 
 

examples/test/test_i_one_kms_cmk_unsigned.py

@@ -16,9 +16,7 @@
 import pytest
 
 from ..src.one_kms_cmk_unsigned import encrypt_decrypt
-from .examples_test_utils import get_cmk_arn
-from .examples_test_utils import static_plaintext
-
+from .examples_test_utils import get_cmk_arn, static_plaintext
 
 pytestmark = [pytest.mark.examples]
 

examples/test/test_i_set_commitment.py

@@ -16,9 +16,7 @@
 import pytest
 
 from ..src.set_commitment import encrypt_decrypt
-from .examples_test_utils import get_cmk_arn
-from .examples_test_utils import static_plaintext
-
+from .examples_test_utils import get_cmk_arn, static_plaintext
 
 pytestmark = [pytest.mark.examples]
 

src/aws_encryption_sdk/internal/crypto/authentication.py

@@ -14,12 +14,13 @@
 import base64
 import logging
 
-from aws_encryption_sdk.internal.utils import verify_interface
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives import hashes, serialization
 from cryptography.hazmat.primitives.asymmetric import ec
 from cryptography.hazmat.primitives.asymmetric.utils import Prehashed
 
+from aws_encryption_sdk.internal.utils import verify_interface
+
 from ...exceptions import NotSupportedError
 from .elliptic_curve import (
     _ecc_encode_compressed_point,

src/aws_encryption_sdk/internal/crypto/elliptic_curve.py

@@ -15,12 +15,13 @@
 from collections import namedtuple
 
 import six
-from aws_encryption_sdk.internal.utils import verify_interface
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives.asymmetric import ec
 from cryptography.hazmat.primitives.asymmetric.utils import Prehashed, decode_dss_signature, encode_dss_signature
 from cryptography.utils import int_from_bytes, int_to_bytes
 
+from aws_encryption_sdk.internal.utils import verify_interface
+
 from ...exceptions import NotSupportedError
 from ..str_ops import to_bytes
 

src/aws_encryption_sdk/internal/utils/__init__.py

@@ -16,13 +16,13 @@
 import os
 
 import six
+from cryptography.hazmat.primitives.asymmetric import ec
 
 import aws_encryption_sdk.internal.defaults
 from aws_encryption_sdk.exceptions import InvalidDataKeyError, SerializationError, UnknownIdentityError
 from aws_encryption_sdk.identifiers import ContentAADString, ContentType
 from aws_encryption_sdk.internal.str_ops import to_bytes
 from aws_encryption_sdk.structures import EncryptedDataKey
-from cryptography.hazmat.primitives.asymmetric import ec
 
 from .streams import InsistentReaderBytesIO
 

test/unit/test_utils.py

@@ -19,9 +19,9 @@
 
 import aws_encryption_sdk.identifiers
 import aws_encryption_sdk.internal.utils
-from aws_encryption_sdk.internal.utils import verify_interface
 from aws_encryption_sdk.exceptions import InvalidDataKeyError, SerializationError, UnknownIdentityError
 from aws_encryption_sdk.internal.defaults import MAX_FRAME_SIZE, MESSAGE_ID_LENGTH
+from aws_encryption_sdk.internal.utils import verify_interface
 from aws_encryption_sdk.structures import DataKey, EncryptedDataKey, MasterKeyInfo, RawDataKey
 
 from .test_values import VALUES

test_vector_handlers/src/awses_test_vectors/internal/aws_kms.py

@@ -15,10 +15,11 @@
     from aws_encryption_sdk.identifiers import AlgorithmSuite
 except ImportError:
     from aws_encryption_sdk.identifiers import Algorithm as AlgorithmSuite
-from aws_encryption_sdk.key_providers.kms import DiscoveryAwsKmsMasterKeyProvider, StrictAwsKmsMasterKeyProvider
 
 from awses_test_vectors.internal.defaults import ENCODING
 
+from aws_encryption_sdk.key_providers.kms import DiscoveryAwsKmsMasterKeyProvider, StrictAwsKmsMasterKeyProvider
+
 # This lets us easily use a single boto3 client per region for all KMS master keys.
 KMS_MASTER_KEY_PROVIDER = DiscoveryAwsKmsMasterKeyProvider()
 

test_vector_handlers/src/awses_test_vectors/internal/util.py

@@ -24,12 +24,11 @@
     from aws_encryption_sdk.identifiers import Algorithm as AlgorithmSuite
 
 try:  # Python 3.5.0 and 3.5.1 have incompatible typing modules
-    from typing import Any, Callable, Dict, Iterable, Type  # noqa pylint: disable=unused-import
-
     from awses_test_vectors.internal.mypy_types import (  # noqa pylint: disable=unused-import
         ISINSTANCE,
         MANIFEST_VERSION,
     )
+    from typing import Any, Callable, Dict, Iterable, Type  # noqa pylint: disable=unused-import
 except ImportError:  # pragma: no cover
     # We only actually need these imports when running the mypy checks
     pass

test_vector_handlers/src/awses_test_vectors/manifests/full_message/decrypt.py

@@ -20,12 +20,8 @@
 from enum import Enum
 
 import attr
-import aws_encryption_sdk
 import pytest
 import six
-from aws_encryption_sdk.identifiers import CommitmentPolicy
-from aws_encryption_sdk.key_providers.base import MasterKeyProvider
-
 from awses_test_vectors.internal.defaults import ENCODING
 from awses_test_vectors.internal.util import (
     dictionary_validator,
@@ -36,14 +32,17 @@
 from awses_test_vectors.manifests.keys import KeysManifest
 from awses_test_vectors.manifests.master_key import MasterKeySpec, master_key_provider_from_master_key_specs
 
-try:  # Python 3.5.0 and 3.5.1 have incompatible typing modules
-    from typing import IO, Callable, Dict, Iterable, Optional  # noqa pylint: disable=unused-import
+import aws_encryption_sdk
+from aws_encryption_sdk.identifiers import CommitmentPolicy
+from aws_encryption_sdk.key_providers.base import MasterKeyProvider
 
+try:  # Python 3.5.0 and 3.5.1 have incompatible typing modules
     from awses_test_vectors.internal.mypy_types import (  # noqa pylint: disable=unused-import
         DECRYPT_SCENARIO_SPEC,
         FULL_MESSAGE_DECRYPT_MANIFEST,
         MASTER_KEY_SPEC,
     )
+    from typing import IO, Callable, Dict, Iterable, Optional  # noqa pylint: disable=unused-import
 except ImportError:  # pragma: no cover
     # We only actually need these imports when running the mypy checks
     pass

test_vector_handlers/src/awses_test_vectors/manifests/full_message/decrypt_generation.py

@@ -23,9 +23,6 @@
 
 import attr
 import six
-from aws_encryption_sdk.materials_managers.base import CryptoMaterialsManager
-from aws_encryption_sdk.materials_managers.default import DefaultCryptoMaterialsManager
-
 from awses_test_vectors.internal.defaults import ENCODING
 from awses_test_vectors.internal.util import (
     dictionary_validator,
@@ -43,19 +40,21 @@
 from awses_test_vectors.manifests.full_message.encrypt import MessageEncryptionTestScenario
 from awses_test_vectors.manifests.keys import KeysManifest
 
+from aws_encryption_sdk.materials_managers.base import CryptoMaterialsManager
+from aws_encryption_sdk.materials_managers.default import DefaultCryptoMaterialsManager
+
 try:
     from aws_encryption_sdk.identifiers import AlgorithmSuite
 except ImportError:
     from aws_encryption_sdk.identifiers import Algorithm as AlgorithmSuite
 
 
 try:  # Python 3.5.0 and 3.5.1 have incompatible typing modules
-    from typing import IO, Callable, Dict, Iterable, Optional  # noqa pylint: disable=unused-import
-
     from awses_test_vectors.internal.mypy_types import (  # noqa pylint: disable=unused-import
         ENCRYPT_SCENARIO_SPEC,
         PLAINTEXTS_SPEC,
     )
+    from typing import IO, Callable, Dict, Iterable, Optional  # noqa pylint: disable=unused-import
 except ImportError:  # pragma: no cover
     # We only actually need these imports when running the mypy checks
     pass

test_vector_handlers/src/awses_test_vectors/manifests/full_message/encrypt.py

@@ -19,10 +19,7 @@
 import os
 
 import attr
-import aws_encryption_sdk
 import six
-from aws_encryption_sdk.key_providers.base import MasterKeyProvider
-
 from awses_test_vectors.internal.defaults import ENCODING
 from awses_test_vectors.internal.util import (
     algorithm_suite_from_string_id,
@@ -35,19 +32,21 @@
 from awses_test_vectors.manifests.keys import KeysManifest
 from awses_test_vectors.manifests.master_key import MasterKeySpec, master_key_provider_from_master_key_specs
 
+import aws_encryption_sdk
+from aws_encryption_sdk.key_providers.base import MasterKeyProvider
+
 try:
     from aws_encryption_sdk.identifiers import AlgorithmSuite, CommitmentPolicy
 except ImportError:
     from aws_encryption_sdk.identifiers import Algorithm as AlgorithmSuite
 
 
 try:  # Python 3.5.0 and 3.5.1 have incompatible typing modules
-    from typing import IO, Callable, Dict, Iterable, Optional  # noqa pylint: disable=unused-import
-
     from awses_test_vectors.internal.mypy_types import (  # noqa pylint: disable=unused-import
         ENCRYPT_SCENARIO_SPEC,
         PLAINTEXTS_SPEC,
     )
+    from typing import IO, Callable, Dict, Iterable, Optional  # noqa pylint: disable=unused-import
 except ImportError:  # pragma: no cover
     # We only actually need these imports when running the mypy checks
     pass

test_vector_handlers/src/awses_test_vectors/manifests/keys.py

@@ -19,21 +19,19 @@
 
 import attr
 import six
-
 from awses_test_vectors.internal.aws_kms import arn_from_key_id
 from awses_test_vectors.internal.defaults import ENCODING
 from awses_test_vectors.internal.util import dictionary_validator, membership_validator, validate_manifest_type
 
 try:  # Python 3.5.0 and 3.5.1 have incompatible typing modules
-    from typing import Dict, Iterable, Optional, cast  # noqa pylint: disable=unused-import
-
     from awses_test_vectors.internal.mypy_types import (  # noqa pylint: disable=unused-import
         AWS_KMS_KEY_SPEC,
         KEY_SPEC,
         KEYS_MANIFEST,
         MANIFEST_VERSION,
         MANUAL_KEY_SPEC,
     )
+    from typing import Dict, Iterable, Optional, cast  # noqa pylint: disable=unused-import
 except ImportError:  # pragma: no cover
     # We only actually need these imports when running the mypy checks
     pass

test_vector_handlers/src/awses_test_vectors/manifests/master_key.py

@@ -17,25 +17,24 @@
 """
 import attr
 import six
+from awses_test_vectors.internal.aws_kms import KMS_MASTER_KEY_PROVIDER
+from awses_test_vectors.internal.util import membership_validator
+from awses_test_vectors.manifests.keys import KeysManifest, KeySpec  # noqa pylint: disable=unused-import
+
 from aws_encryption_sdk.identifiers import EncryptionKeyType, WrappingAlgorithm
 from aws_encryption_sdk.key_providers.base import MasterKeyProvider  # noqa pylint: disable=unused-import
 from aws_encryption_sdk.key_providers.kms import KMSMasterKey  # noqa pylint: disable=unused-import
 from aws_encryption_sdk.key_providers.raw import RawMasterKey
 
-from awses_test_vectors.internal.aws_kms import KMS_MASTER_KEY_PROVIDER
-from awses_test_vectors.internal.util import membership_validator
-from awses_test_vectors.manifests.keys import KeysManifest, KeySpec  # noqa pylint: disable=unused-import
-
 try:
     from aws_encryption_sdk.internal.crypto.wrapping_keys import WrappingKey
 except ImportError:
     from aws_encryption_sdk.internal.crypto import WrappingKey
 
 
 try:  # Python 3.5.0 and 3.5.1 have incompatible typing modules
-    from typing import Iterable  # noqa pylint: disable=unused-import
-
     from awses_test_vectors.internal.mypy_types import MASTER_KEY_SPEC  # noqa pylint: disable=unused-import
+    from typing import Iterable  # noqa pylint: disable=unused-import
 except ImportError:  # pragma: no cover
     # We only actually need these imports when running the mypy checks
     pass