cleanup

Author: lucasmcdonald3

src/aws_encryption_sdk/streaming_client.py

@@ -171,7 +171,7 @@ def _has_mpl_attrs_post_init(self):
                 except AwsCryptographicMaterialProvidersException as mpl_exception:
                     # Wrap MPL error into the ESDK error type
                     # so customers only have to catch ESDK error types.
-                    raise AWSEncryptionSDKClientError(mpl_exception)                    
+                    raise AWSEncryptionSDKClientError(mpl_exception)               
 
     def _no_mpl_attrs_post_init(self):
         """If the MPL is NOT present in the runtime, perform post-init logic

test/unit/test_crypto_authentication_signer.py

@@ -11,9 +11,9 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 """Unit test suite for ``aws_encryption_sdk.internal.crypto.authentication.Signer``."""
-import pytest
-from mock import MagicMock, sentinel, patch
 import cryptography.hazmat.primitives.serialization
+import pytest
+from mock import MagicMock, patch, sentinel
 from pytest_mock import mocker  # noqa pylint: disable=unused-import
 
 import aws_encryption_sdk.internal.crypto.authentication
@@ -76,7 +76,7 @@ def test_f_signer_from_key_bytes():
 def test_f_signer_key_bytes():
     test = Signer(algorithm=ALGORITHM, key=VALUES["ecc_private_key_prime"])
     assert test.key_bytes() == VALUES["ecc_private_key_prime_private_bytes"]
-    
+
 
 def test_GIVEN_no_encoding_WHEN_signer_from_key_bytes_THEN_load_der_private_key(
     patch_default_backend,
@@ -93,7 +93,10 @@ def test_GIVEN_no_encoding_WHEN_signer_from_key_bytes_THEN_load_der_private_key(
     # Mock the `serialization.Encoding.DER`
     with patch.object(cryptography.hazmat.primitives, "serialization"):
         # Mock the `serialization.load_der_private_key`
-        with patch.object(aws_encryption_sdk.internal.crypto.authentication.serialization, "load_der_private_key") as mock_der:
+        with patch.object(
+            aws_encryption_sdk.internal.crypto.authentication.serialization,
+            "load_der_private_key"
+        ) as mock_der:
             # When: from_key_bytes
             Signer.from_key_bytes(
                 algorithm=_algorithm,
@@ -106,7 +109,7 @@ def test_GIVEN_no_encoding_WHEN_signer_from_key_bytes_THEN_load_der_private_key(
                 data=sentinel.key_bytes, password=None, backend=patch_default_backend.return_value
             )
 
-    
+
 def test_GIVEN_PEM_encoding_WHEN_signer_from_key_bytes_THEN_load_pem_private_key(
     patch_default_backend,
     patch_serialization,
@@ -145,7 +148,7 @@ def test_GIVEN_unrecognized_encoding_WHEN_signer_from_key_bytes_THEN_raise_Value
     # Then: Raises ValueError
     with pytest.raises(ValueError):
         # When: from_key_bytes
-        signer = Signer.from_key_bytes(
+        Signer.from_key_bytes(
             algorithm=_algorithm,
             key_bytes=sentinel.key_bytes,
             # Given: Invalid encoding

test/unit/test_streaming_client_configs.py

@@ -33,14 +33,10 @@
 # Ideally, this logic would be based on mocking imports and testing logic,
 # but doing that introduces errors that cause other tests to fail.
 try:
-    from aws_cryptographic_materialproviders.mpl.references import (
-        IKeyring,
-    )
+    from aws_cryptographic_materialproviders.mpl.references import IKeyring
     HAS_MPL = True
 
-    from aws_encryption_sdk.materials_managers.mpl.cmm import (
-        CryptoMaterialsManagerFromMPL,
-    )
+    from aws_encryption_sdk.materials_managers.mpl.cmm import CryptoMaterialsManagerFromMPL
 except ImportError:
     HAS_MPL = False
 
@@ -59,14 +55,15 @@ class FakeMasterKeyProvider(MasterKeyProvider):
 
     def _new_master_key(self, key_id):
         return
-    
+
+
 if HAS_MPL:
     class FakeKeyring(IKeyring):
         def on_encrypt(self, param):
-            return 
-        
+            return
+
         def on_decrypt(self, param):
-            return 
+            return
 
 
 BASE_KWARGS = dict(
@@ -234,10 +231,10 @@ def test_client_configs_with_mpl(
     kwargs["commitment_policy"] = CommitmentPolicy.REQUIRE_ENCRYPT_REQUIRE_DECRYPT
 
     test = _ClientConfig(**kwargs)
-    
+
     # In all cases, config should have a materials manager
     assert test.materials_manager is not None
-    
+
     # If materials manager was provided, it should be directly used
     if hasattr(kwargs, "materials_manager"):
         assert kwargs["materials_manager"] == test.materials_manager
@@ -266,10 +263,10 @@ def test_keyring_client_config_with_mpl(
     }
 
     test = _ClientConfig(**kwargs)
-    
+
     # In all cases, config should have a materials manager
     assert test.materials_manager is not None
-    
+
     # If materials manager was provided, it should be directly used
     if hasattr(kwargs, "materials_manager"):
         assert kwargs["materials_manager"] == test.materials_manager

test/unit/test_streaming_client_stream_decryptor.py

@@ -37,9 +37,7 @@
 # Ideally, this logic would be based on mocking imports and testing logic,
 # but doing that introduces errors that cause other tests to fail.
 try:
-    from aws_encryption_sdk.materials_managers.mpl.cmm import (
-        CryptoMaterialsManagerFromMPL,
-    )
+    from aws_encryption_sdk.materials_managers.mpl.cmm import CryptoMaterialsManagerFromMPL
     HAS_MPL = True
 
 except ImportError:
@@ -55,7 +53,7 @@ def apply_fixtures(self):
             data_key=VALUES["data_key_obj"], verification_key=sentinel.verification_key
         )
         self.mock_materials_manager.decrypt_materials.return_value = self.mock_decrypt_materials
-        
+
         if HAS_MPL:
             self.mock_mpl_materials_manager = MagicMock(__class__=CryptoMaterialsManagerFromMPL)
             self.mock_mpl_materials_manager.decrypt_materials.return_value = self.mock_decrypt_materials
@@ -258,7 +256,7 @@ def test_GIVEN_verification_key_AND_no_mpl_WHEN_read_header_THEN_calls_from_key_
         # When: read header
         test_decryptor._read_header()
 
-        # Then: calls from_key_bytes 
+        # Then: calls from_key_bytes
         mock_verifier.from_key_bytes.assert_called_once_with(
             algorithm=self.mock_header.algorithm, key_bytes=sentinel.verification_key
         )

test/unit/test_streaming_client_stream_encryptor.py

@@ -13,9 +13,9 @@
 """Unit test suite for aws_encryption_sdk.streaming_client.StreamEncryptor"""
 import io
 
-from cryptography.hazmat.primitives import serialization
 import pytest
 import six
+from cryptography.hazmat.primitives import serialization
 from mock import MagicMock, call, patch, sentinel
 
 import aws_encryption_sdk.internal.defaults
@@ -42,9 +42,7 @@
 # Ideally, this logic would be based on mocking imports and testing logic,
 # but doing that introduces errors that cause other tests to fail.
 try:
-    from aws_encryption_sdk.materials_managers.mpl.cmm import (
-        CryptoMaterialsManagerFromMPL,
-    )
+    from aws_encryption_sdk.materials_managers.mpl.cmm import CryptoMaterialsManagerFromMPL
     HAS_MPL = True
 
 except ImportError:

test/unit/test_utils.py

@@ -268,25 +268,25 @@ def test_source_data_key_length_check_invalid(self):
 
     def test_exactly_one_arg_is_not_none(self):
         # No args => no args are not None
-        assert aws_encryption_sdk.internal.utils.exactly_one_arg_is_not_none() is False 
+        assert aws_encryption_sdk.internal.utils.exactly_one_arg_is_not_none() is False
         assert aws_encryption_sdk.internal.utils.exactly_one_arg_is_not_none(
             None
-        ) is False 
+        ) is False
         assert aws_encryption_sdk.internal.utils.exactly_one_arg_is_not_none(
             "not None"
-        ) is True 
+        ) is True
         assert aws_encryption_sdk.internal.utils.exactly_one_arg_is_not_none(
             "not None", "also not None"
-        ) is False 
+        ) is False
         assert aws_encryption_sdk.internal.utils.exactly_one_arg_is_not_none(
             "not None", None
-        ) is True 
+        ) is True
         assert aws_encryption_sdk.internal.utils.exactly_one_arg_is_not_none(
             "not None", "also not None"
-        ) is False 
+        ) is False
         assert aws_encryption_sdk.internal.utils.exactly_one_arg_is_not_none(
             None, "not None"
-        ) is True 
+        ) is True
         assert aws_encryption_sdk.internal.utils.exactly_one_arg_is_not_none(
             None, None
-        ) is False 
+        ) is False