cleanup

Author: lucasmcdonald3

src/aws_encryption_sdk/internal/formatting/serialize.py

@@ -237,7 +237,7 @@ def _serialize_header_auth_v2(
         for all items whose keys are in the required_encryption_context list.
         This is ONLY processed if using the aws-cryptographic-materialproviders library
         AND its required encryption context CMM. (optional)
-    :type required_encryption_context_bytes: bytes 
+    :type required_encryption_context_bytes: bytes
     :returns: Serialized header authentication data
     :rtype: bytes
     """
@@ -294,14 +294,16 @@ def serialize_header_auth(
         This is ONLY processed if using the aws-cryptographic-materialproviders library
         AND its required encryption context CMM
         AND if using the v2 message format. (optional)
-    :type required_encryption_context_bytes: bytes 
+    :type required_encryption_context_bytes: bytes
     :returns: Serialized header authentication data
     :rtype: bytes
     """
     if version == SerializationVersion.V1:
         return _serialize_header_auth_v1(algorithm, header, data_encryption_key, signer)
     elif version == SerializationVersion.V2:
-        return _serialize_header_auth_v2(algorithm, header, data_encryption_key, signer, required_encryption_context_bytes)
+        return _serialize_header_auth_v2(
+            algorithm, header, data_encryption_key, signer, required_encryption_context_bytes
+        )
     else:
         raise SerializationError("Unrecognized message format version: {}".format(version))
 

src/aws_encryption_sdk/materials_managers/mpl/materials.py

@@ -95,7 +95,6 @@ def data_encryption_key(self) -> DataKey:
     def signing_key(self) -> bytes:
         """Materials' signing key."""
         return self.mpl_materials.signing_key
-    
 
     @property
     def required_encryption_context_keys(self) -> bytes:

src/aws_encryption_sdk/streaming_client.py

@@ -198,7 +198,7 @@ def _has_mpl_attrs_post_init(self):
                     # Wrap MPL error into the ESDK error type
                     # so customers only have to catch ESDK error types.
                     raise AWSEncryptionSDKClientError(mpl_exception)
-                
+
         # If the provided materials_manager is directly from the MPL, wrap it in a native interface
         # for internal use.
         elif (self.materials_manager is not None
@@ -673,9 +673,10 @@ def _write_header(self):
         # If there is _required_encryption_context,
         # serialize it, then authenticate it
         if hasattr(self, "_required_encryption_context"):
-            required_ec_serialized = aws_encryption_sdk.internal.formatting.encryption_context.serialize_encryption_context(
-                self._required_encryption_context
-            )
+            required_ec_serialized = \
+                aws_encryption_sdk.internal.formatting.encryption_context.serialize_encryption_context(
+                    self._required_encryption_context
+                )
             self.output_buffer += serialize_header_auth(
                 version=self._header.version,
                 algorithm=self._encryption_materials.algorithm,
@@ -955,7 +956,7 @@ def _prep_message(self):
             self._prep_non_framed()
         self._message_prepped = True
 
-    def _read_header(self):
+    def _read_header(self):  # noqa: C901
         """Reads the message header from the input stream.
 
         :returns: tuple containing deserialized header and header_auth objects
@@ -1056,9 +1057,10 @@ def _read_header(self):
             # The authenticated only encryption context is all encryption context key-value pairs where the
             # key exists in Required Encryption Context Keys. It is then serialized according to the
             # message header Key Value Pairs.
-            required_ec_serialized = aws_encryption_sdk.internal.formatting.encryption_context.serialize_encryption_context(
-                self._required_encryption_context
-            )
+            required_ec_serialized = \
+                aws_encryption_sdk.internal.formatting.encryption_context.serialize_encryption_context(
+                    self._required_encryption_context
+                )
 
             validate_header(
                 header=header,