autoformat

Author: mattsb42-aws

src/aws_encryption_sdk/streaming_client.py

@@ -804,9 +804,7 @@ def _read_bytes_from_non_framed_body(self, b):
             self.verifier.update(ciphertext)
 
         tag = aws_encryption_sdk.internal.formatting.deserialize.deserialize_tag(
-            stream=self.source_stream,
-            header=self._header,
-            verifier=self.verifier,
+            stream=self.source_stream, header=self._header, verifier=self.verifier
         )
 
         aad_content_string = aws_encryption_sdk.internal.utils.get_aad_content_string(

test/functional/test_f_aws_encryption_sdk_client.py

@@ -761,7 +761,9 @@ def test_cycle_nothing_but_read(frame_length):
     raw_plaintext = exact_length_plaintext(100)
     plaintext = NothingButRead(raw_plaintext)
     key_provider = fake_kms_key_provider()
-    raw_ciphertext, _encrypt_header = aws_encryption_sdk.encrypt(source=plaintext, key_provider=key_provider, frame_length=frame_length)
+    raw_ciphertext, _encrypt_header = aws_encryption_sdk.encrypt(
+        source=plaintext, key_provider=key_provider, frame_length=frame_length
+    )
     ciphertext = NothingButRead(raw_ciphertext)
     decrypted, _decrypt_header = aws_encryption_sdk.decrypt(source=ciphertext, key_provider=key_provider)
     assert raw_plaintext == decrypted
@@ -773,7 +775,9 @@ def test_encrypt_nothing_but_read(frame_length):
     raw_plaintext = exact_length_plaintext(100)
     plaintext = NothingButRead(raw_plaintext)
     key_provider = fake_kms_key_provider()
-    ciphertext, _encrypt_header = aws_encryption_sdk.encrypt(source=plaintext, key_provider=key_provider, frame_length=frame_length)
+    ciphertext, _encrypt_header = aws_encryption_sdk.encrypt(
+        source=plaintext, key_provider=key_provider, frame_length=frame_length
+    )
     decrypted, _decrypt_header = aws_encryption_sdk.decrypt(source=ciphertext, key_provider=key_provider)
     assert raw_plaintext == decrypted
 
@@ -783,7 +787,9 @@ def test_encrypt_nothing_but_read(frame_length):
 def test_decrypt_nothing_but_read(frame_length):
     plaintext = exact_length_plaintext(100)
     key_provider = fake_kms_key_provider()
-    raw_ciphertext, _encrypt_header = aws_encryption_sdk.encrypt(source=plaintext, key_provider=key_provider, frame_length=frame_length)
+    raw_ciphertext, _encrypt_header = aws_encryption_sdk.encrypt(
+        source=plaintext, key_provider=key_provider, frame_length=frame_length
+    )
     ciphertext = NothingButRead(raw_ciphertext)
     decrypted, _decrypt_header = aws_encryption_sdk.decrypt(source=ciphertext, key_provider=key_provider)
     assert plaintext == decrypted
@@ -801,8 +807,7 @@ def test_decryptor_deprecated_attributes(caplog, attribute, no_later_than):
     assert decrypted == plaintext
     assert hasattr(decryptor, attribute)
     watch_string = "StreamDecryptor.{name} is deprecated and will be removed in {version}".format(
-        name=attribute,
-        version=no_later_than
+        name=attribute, version=no_later_than
     )
     assert watch_string in caplog.text
     assert aws_encryption_sdk.__version__ < no_later_than

test/unit/test_deserialize.py

@@ -31,28 +31,26 @@
 
 
 def test_deserialize_non_framed_values():
-    iv = b'\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11'
+    iv = b"\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11"
     length = 42
     packed = struct.pack(">12sQ", iv, length)
     mock_header = MagicMock(algorithm=MagicMock(iv_len=12))
 
     parsed_iv, parsed_length = aws_encryption_sdk.internal.formatting.deserialize.deserialize_non_framed_values(
-        stream=io.BytesIO(packed),
-        header=mock_header
+        stream=io.BytesIO(packed), header=mock_header
     )
 
     assert parsed_iv == iv
     assert parsed_length == length
 
 
 def test_deserialize_tag():
-    tag = b'\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11\x12\x13\x14\x15'
+    tag = b"\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x10\x11\x12\x13\x14\x15"
     packed = struct.pack(">16s", tag)
     mock_header = MagicMock(algorithm=MagicMock(auth_len=16))
 
     parsed_tag = aws_encryption_sdk.internal.formatting.deserialize.deserialize_tag(
-        stream=io.BytesIO(packed),
-        header=mock_header
+        stream=io.BytesIO(packed), header=mock_header
     )
 
     assert parsed_tag == tag

test/unit/test_streaming_client_stream_decryptor.py

@@ -41,7 +41,7 @@ def setUp(self):
         self.mock_header.encrypted_data_keys = sentinel.encrypted_data_keys
         self.mock_header.encryption_context = sentinel.encryption_context
 
-        self.mock_raw_header = b'some bytes'
+        self.mock_raw_header = b"some bytes"
 
         self.mock_input_stream = MagicMock()
         self.mock_input_stream.__class__ = io.IOBase
@@ -74,8 +74,7 @@ def setUp(self):
         self.mock_deserialize_non_framed_values.return_value = (sentinel.iv, len(VALUES["data_128"]))
         # Set up deserialize_tag_value patch
         self.mock_deserialize_tag_patcher = patch(
-            "aws_encryption_sdk.streaming_client"
-            ".aws_encryption_sdk.internal.formatting.deserialize.deserialize_tag"
+            "aws_encryption_sdk.streaming_client" ".aws_encryption_sdk.internal.formatting.deserialize.deserialize_tag"
         )
         self.mock_deserialize_tag = self.mock_deserialize_tag_patcher.start()
         self.mock_deserialize_tag.return_value = sentinel.tag
@@ -221,9 +220,7 @@ def test_read_header_frame_too_large(self, mock_derive_datakey):
     @patch("aws_encryption_sdk.streaming_client.Verifier")
     @patch("aws_encryption_sdk.streaming_client.DecryptionMaterialsRequest")
     @patch("aws_encryption_sdk.streaming_client.derive_data_encryption_key")
-    def test_read_header_no_verifier(
-        self, mock_derive_datakey, mock_decrypt_materials_request, mock_verifier
-    ):
+    def test_read_header_no_verifier(self, mock_derive_datakey, mock_decrypt_materials_request, mock_verifier):
         self.mock_materials_manager.decrypt_materials.return_value = MagicMock(
             data_key=VALUES["data_key_obj"], verification_key=None
         )
@@ -286,9 +283,7 @@ def test_read_bytes_from_non_framed(self):
         test = test_decryptor._read_bytes_from_non_framed_body(5)
 
         self.mock_deserialize_tag.assert_called_once_with(
-            stream=test_decryptor.source_stream,
-            header=test_decryptor._header,
-            verifier=test_decryptor.verifier
+            stream=test_decryptor.source_stream, header=test_decryptor._header, verifier=test_decryptor.verifier
         )
         self.mock_get_aad_content_string.assert_called_once_with(
             content_type=self.mock_header.content_type, is_final_frame=True

test/unit/unit_test_utils.py

@@ -14,6 +14,7 @@
 import copy
 import io
 import itertools
+
 from aws_encryption_sdk.internal.utils.streams import InsistentReaderBytesIO