Skip to content

Commit

Permalink
flake8
Browse files Browse the repository at this point in the history
  • Loading branch information
lucasmcdonald3 committed Feb 2, 2024
1 parent b5d3327 commit b13cd19
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 34 deletions.
7 changes: 5 additions & 2 deletions src/aws_encryption_sdk/cmm_handler.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,11 @@ def __init__(
self,
cmm: 'CryptoMaterialsManager | ICryptographicMaterialsManager'
):
"""
Create DecryptionMaterialsHandler.
:param cmm: Underlying cryptographic materials manager
"""

if isinstance(cmm, CryptoMaterialsManager):
self.native_cmm = cmm
elif isinstance(cmm, ICryptographicMaterialsManager):
Expand All @@ -78,7 +83,6 @@ def get_encryption_materials(
Returns an EncryptionMaterialsHandler for the configured CMM.
:param request: Request for encryption materials
"""

if (self._is_using_native_cmm()):
return EncryptionMaterialsHandler(self.native_cmm.get_encryption_materials(request))
else:
Expand Down Expand Up @@ -130,7 +134,6 @@ def decrypt_materials(
Returns a DecryptionMaterialsHandler for the configured CMM.
:param request: Request for decryption materials
"""

if (self._is_using_native_cmm()):
return DecryptionMaterialsHandler(self.native_cmm.decrypt_materials(request))
else:
Expand Down
37 changes: 7 additions & 30 deletions src/aws_encryption_sdk/materials_handlers.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ def __init__(
Create EncryptionMaterialsHandler.
:param materials: Underlying encryption materials
"""

if isinstance(materials, Native_EncryptionMaterials):
self.native_materials = materials
elif isinstance(materials, MPL_EncryptionMaterials):
Expand All @@ -58,10 +57,7 @@ def __init__(

@property
def algorithm(self) -> Algorithm:
"""
Materials' native Algorithm.
"""

"""Materials' native Algorithm."""
if hasattr(self, "native_materials"):
return self.native_materials.algorithm
else:
Expand All @@ -73,21 +69,15 @@ def algorithm(self) -> Algorithm:

@property
def encryption_context(self) -> dict[str, str]:
"""
Materials' encryption context.
"""

"""Materials' encryption context."""
if hasattr(self, "native_materials"):
return self.native_materials.encryption_context
else:
return self.mpl_materials.encryption_context

@property
def encrypted_data_keys(self) -> list[Native_EncryptedDataKey]:
"""
Materials' encrypted data keys.
"""

"""Materials' encrypted data keys."""
if hasattr(self, "native_materials"):
return self.native_materials.encrypted_data_keys
else:
Expand All @@ -103,10 +93,7 @@ def encrypted_data_keys(self) -> list[Native_EncryptedDataKey]:

@property
def data_encryption_key(self) -> DataKey:
"""
Materials' data encryption key.
"""

"""Materials' data encryption key."""
if hasattr(self, "native_materials"):
return self.native_materials.data_encryption_key
else:
Expand All @@ -126,10 +113,7 @@ def data_encryption_key(self) -> DataKey:

@property
def signing_key(self) -> bytes:
"""
Materials' signing key.
"""

"""Materials' signing key."""
if hasattr(self, "native_materials"):
return self.native_materials.signing_key
else:
Expand All @@ -155,7 +139,6 @@ def __init__(
Create DecryptionMaterialsHandler.
:param materials: Underlying decryption materials
"""

if isinstance(materials, Native_DecryptionMaterials):
self.native_materials = materials
elif isinstance(materials, MPL_DecryptionMaterials):
Expand All @@ -165,10 +148,7 @@ def __init__(

@property
def data_key(self) -> DataKey:
"""
Materials' data key.
"""

"""Materials' data key."""
if hasattr(self, "native_materials"):
return self.native_materials.data_key
else:
Expand All @@ -186,10 +166,7 @@ def data_key(self) -> DataKey:

@property
def verification_key(self) -> bytes:
"""
Materials' verification key.
"""

"""Materials' verification key."""
if hasattr(self, "native_materials"):
return self.native_materials.verification_key
else:
Expand Down
4 changes: 2 additions & 2 deletions src/aws_encryption_sdk/streaming_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,11 @@


def _exactly_one_arg_is_not_None(*args):
'''
"""
Private helper function.
Returns `True` if exactly one item in the list is not `None`.
Returns `False` otherwise.
'''
"""
# Have not found any `not None`
found_one = False
for arg in args:
Expand Down

0 comments on commit b13cd19

Please sign in to comment.