linting fixes

Author: mattsb42-aws

src/aws_encryption_sdk/internal/formatting/deserialize.py

@@ -12,6 +12,7 @@
 # language governing permissions and limitations under the License.
 """Components for handling AWS Encryption SDK message deserialization."""
 from __future__ import division
+
 import io
 import logging
 import struct

src/aws_encryption_sdk/streaming_client.py

@@ -12,6 +12,7 @@
 # language governing permissions and limitations under the License.
 """High level AWS Encryption SDK client for streaming objects."""
 from __future__ import division
+
 import abc
 import io
 import logging

test/functional/test_f_xcompat.py

@@ -11,7 +11,6 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 """Functional test suite testing decryption of known good test files encrypted using static RawMasterKeyProvider."""
-from __future__ import print_function
 import base64
 from collections import defaultdict
 import json
@@ -78,7 +77,6 @@ def _get_raw_key(self, key_id):
             key_bits = int(key_bits)
             key_type = _KEY_TYPES_MAP[algorithm]
             wrapping_algorithm = _WRAPPING_ALGORITHM_MAP[algorithm][key_bits][padding_algorithm][padding_hash]
-            print('looking up {} {}'.format(algorithm, key_bits))
             static_key = _STATIC_KEYS[algorithm][key_bits]
             return WrappingKey(
                 wrapping_algorithm=wrapping_algorithm,
@@ -113,7 +111,7 @@ class Scenario(object):
     key_ids = attr.ib(validator=attr.validators.instance_of(list))
 
 
-def _generate_test_cases():
+def _generate_test_cases():  # noqa=C901
     try:
         root_dir = os.path.abspath(file_root())
     except Exception:  # pylint: disable=broad-except

test/integration/test_i_aws_encrytion_sdk_client.py

@@ -18,7 +18,6 @@
 
 import aws_encryption_sdk
 from aws_encryption_sdk.identifiers import Algorithm
-
 from .integration_test_utils import setup_kms_master_key_provider, SKIP_MESSAGE, skip_tests
 
 

test/integration/test_i_xcompat_kms.py

@@ -17,7 +17,6 @@
 import pytest
 
 import aws_encryption_sdk
-
 from .integration_test_utils import setup_kms_master_key_provider, SKIP_MESSAGE, skip_tests
 
 

test/unit/test_crypto_authentication_signer.py

@@ -18,7 +18,6 @@
 import aws_encryption_sdk.internal.crypto.authentication
 from aws_encryption_sdk.internal.crypto.authentication import Signer
 from aws_encryption_sdk.internal.defaults import ALGORITHM
-
 from .test_crypto import VALUES
 
 

test/unit/test_crypto_authentication_verifier.py

@@ -18,7 +18,6 @@
 import aws_encryption_sdk.internal.crypto.authentication
 from aws_encryption_sdk.internal.crypto.authentication import Verifier
 from aws_encryption_sdk.internal.defaults import ALGORITHM
-
 from .test_crypto import VALUES
 
 

test/unit/test_crypto_elliptic_curve.py

@@ -26,7 +26,6 @@
     _ecc_public_numbers_from_compressed_point, _ecc_static_length_signature,
     _ECCCurveParameters, generate_ecc_signing_key
 )
-
 from .test_crypto import VALUES
 
 

test/unit/test_crypto_wrapping_keys.py

@@ -20,7 +20,6 @@
 import aws_encryption_sdk.internal.crypto.wrapping_keys
 from aws_encryption_sdk.internal.crypto.wrapping_keys import WrappingKey
 from aws_encryption_sdk.internal.structures import EncryptedData
-
 from .test_crypto import VALUES
 
 

test/unit/test_providers_base_master_key_config.py

@@ -11,7 +11,6 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 """Unit test suite to validate aws_encryption_sdk.key_providers.base.MasterKeyConfig"""
-from mock import sentinel
 import pytest
 
 from aws_encryption_sdk.key_providers.base import MasterKeyConfig

test/unit/test_providers_base_master_key_provider.py

@@ -21,7 +21,6 @@
     DecryptKeyError, IncorrectMasterKeyError, InvalidKeyIdError, MasterKeyProviderError
 )
 from aws_encryption_sdk.key_providers.base import MasterKeyProvider, MasterKeyProviderConfig
-
 from .test_values import VALUES
 
 

test/unit/test_providers_raw_master_key_config.py

@@ -12,6 +12,7 @@
 # language governing permissions and limitations under the License.
 """Unit test suite to validate aws_encryption_sdk.key_providers.raw.RawMasterKeyConfig"""
 import pytest
+import six
 
 from aws_encryption_sdk.identifiers import EncryptionKeyType, WrappingAlgorithm
 from aws_encryption_sdk.internal.crypto.wrapping_keys import WrappingKey
@@ -50,4 +51,4 @@ def test_parent():
 @pytest.mark.parametrize('cls, kwargs', all_valid_kwargs(VALID_KWARGS))
 def test_attributes_converts(cls, kwargs):
     test = cls(**kwargs)
-    assert isinstance(test.provider_id, str)
+    assert isinstance(test.provider_id, six.string_types)

test/unit/test_streaming_client_configs.py

@@ -20,7 +20,7 @@
 from aws_encryption_sdk.key_providers.base import MasterKeyProvider, MasterKeyProviderConfig
 from aws_encryption_sdk.materials_managers.base import CryptoMaterialsManager
 from aws_encryption_sdk.materials_managers.default import DefaultCryptoMaterialsManager
-from aws_encryption_sdk.streaming_client import _ClientConfig, EncryptorConfig, DecryptorConfig
+from aws_encryption_sdk.streaming_client import _ClientConfig, DecryptorConfig, EncryptorConfig
 from .unit_test_utils import all_invalid_kwargs, all_valid_kwargs, build_valid_kwargs_list
 
 
@@ -64,8 +64,8 @@ def _new_master_key(self, key_id):
         dict(source=b'', materials_manager=FakeCryptoMaterialsManager(), key_provider=FakeMasterKeyProvider())
     ],
     EncryptorConfig: [
-      dict(source=b'', materials_manager=FakeCryptoMaterialsManager(), encryption_context=None),
-      dict(source=b'', materials_manager=FakeCryptoMaterialsManager(), frame_length=None)
+        dict(source=b'', materials_manager=FakeCryptoMaterialsManager(), encryption_context=None),
+        dict(source=b'', materials_manager=FakeCryptoMaterialsManager(), frame_length=None)
     ],
     DecryptorConfig: [
         dict(source=b'', materials_manager=FakeCryptoMaterialsManager(), max_body_length='not an int')