Merge pull request #106 from NHSDigital/mesh-2092-fresh-combined-deps

MESH-2092 combine deps

Author: acarriedev

CONTRIBUTING.md

@@ -74,5 +74,3 @@ lint checks will fail if the code is not formaated correctly
 # make black will run both isort and black
 make black
 ```
-
-

nhs_aws_helpers/__init__.py

@@ -837,10 +837,7 @@ def _should_retry(self, err: ClientError, retries: int):
         if reasons:
             return True
 
-        if err.response["Error"]["Code"] in _RETRY_EXCEPTIONS:
-            return True
-
-        return False
+        return err.response["Error"]["Code"] in _RETRY_EXCEPTIONS
 
     def _sleep_for(self, retries: int):
         backoff = pow(2, retries) * self._backoff

nhs_aws_helpers/dynamodb_model_store/base_model_store.py

@@ -140,7 +140,7 @@ def deserialise_value(cls, value_type: type, value: Any, **kwargs) -> Any:  # no
 
         if value and value_type in (bytes, bytearray) and hasattr(value, "value"):
             value = value.value
-            if value_type == bytearray:
+            if value_type is bytearray:
                 value = bytearray(value)
 
         if value_type in (str, bool, bytes, bytearray):
@@ -160,18 +160,18 @@ def deserialise_value(cls, value_type: type, value: Any, **kwargs) -> Any:  # no
 
         origin_type = get_origin(value_type)
 
-        if origin_type == list:
+        if origin_type is list:
             item_type = get_args(value_type)[0]
             return [cls.deserialise_value(item_type, val, **kwargs) for val in value]
 
-        if origin_type == dict:
+        if origin_type is dict:
             val_type = get_args(value_type)[1]
             return {key: cls.deserialise_value(val_type, val, **kwargs) for key, val in value.items()}
 
-        if origin_type == frozenset:
+        if origin_type is frozenset:
             return frozenset(val for val in value)
 
-        if origin_type == set:
+        if origin_type is set:
             return set(value)
 
         return value
@@ -413,10 +413,7 @@ async def item_exists(self, key: TModelKey, consistent_read: bool = False, **kwa
         item = await self.get_item(
             key, ConsistentRead=consistent_read, ProjectionExpression=self._partition_key, **kwargs
         )
-        if not item or self._partition_key not in item:
-            return False
-
-        return True
+        return not (not item or self._partition_key not in item)
 
     @dynamodb_retry_backoff()
     async def delete_item(self, key: TModelKey, **kwargs):