fix

Author: lucasmcdonald3

src/aws_encryption_sdk/materials_managers/mpl/cmm.py

@@ -2,7 +2,6 @@
 
 The aws-cryptographic-materials-library MUST be installed to use this module.
 """
-from typing import List
 # pylint should pass even if the MPL isn't installed
 # Also thinks these imports aren't used if it can't import them
 # noqa pylint: disable=import-error,unused-import
@@ -21,13 +20,19 @@
 )
 # noqa pylint: enable=import-error,unused-import
 
+# pylint and isort disagree on where this should go. Choose isort and disable pylint for this.
+from typing import List  # noqa pylint: disable=wrong-import-order
+
 from aws_encryption_sdk.exceptions import AWSEncryptionSDKClientError
 from aws_encryption_sdk.identifiers import CommitmentPolicy
 from aws_encryption_sdk.materials_managers import DecryptionMaterialsRequest, EncryptionMaterialsRequest
 from aws_encryption_sdk.materials_managers.base import CryptoMaterialsManager
 from aws_encryption_sdk.materials_managers.mpl.materials import DecryptionMaterialsFromMPL, EncryptionMaterialsFromMPL
 from aws_encryption_sdk.structures import EncryptedDataKey as Native_EncryptedDataKey
 
+# noqa pylint: enable=import-error,unused-import
+
+
 
 class CryptoMaterialsManagerFromMPL(CryptoMaterialsManager):
     """

src/aws_encryption_sdk/materials_managers/mpl/materials.py

@@ -2,7 +2,6 @@
 
 The aws-cryptographic-materials-library MUST be installed to use this module.
 """
-from typing import Dict, List, Set
 # pylint should pass even if the MPL isn't installed
 # noqa pylint: disable=import-error
 from aws_cryptographic_materialproviders.mpl.models import (
@@ -12,6 +11,9 @@
 )
 # noqa pylint: enable=import-error
 
+# pylint and isort disagree on where this should go. Choose isort and disable pylint for this.
+from typing import Dict, List, Set  # noqa pylint: disable=wrong-import-order
+
 from aws_encryption_sdk.identifiers import Algorithm, AlgorithmSuite
 from aws_encryption_sdk.materials_managers import (
     DecryptionMaterials as Native_DecryptionMaterials,