jonathanmorley · Aug 27, 2020 · Aug 27, 2020
diff --git a/python/rpdk/python/templates/models.py b/python/rpdk/python/templates/models.py
@@ -60,12 +60,12 @@ def _deserialize(
             {% set container = type.container %}
             {% set resolved_type = type.type %}
             {% if container == ContainerType.MODEL %}
-            {{ name }}={{ resolved_type }}._deserialize(json_data.get("{{ resolved_type }}")),
+            {{ name }}={{ resolved_type }}._deserialize(json_data.get("{{ name }}")),
             {% elif container == ContainerType.SET %}
-            {{ name }}=set_or_none(json_data.get("{{ resolved_type.type }}")),
+            {{ name }}=set_or_none(json_data.get("{{ name }}")),
             {% elif container == ContainerType.LIST %}
             {% if type | contains_model %}
-            {{name}}=deserialize_list(json_data.get("{{ resolved_type.type }}"), {{resolved_type.type}}),
+            {{name}}=deserialize_list(json_data.get("{{ name }}"), {{resolved_type.type}}),
             {% else %}
             {{ name }}=json_data.get("{{ name }}"),
             {% endif %}

diff --git a/src/cloudformation_cli_python_lib/log_delivery.py b/src/cloudformation_cli_python_lib/log_delivery.py
@@ -19,7 +19,7 @@ class ProviderLogHandler(logging.Handler):
     def __init__(
         self, group: str, stream: str, session: SessionProxy, *args: Any, **kwargs: Any
     ):
-        super(ProviderLogHandler, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.group = group
         self.stream = stream.replace(":", "__")
         self.client = session.client("logs")

diff --git a/src/cloudformation_cli_python_lib/recast.py b/src/cloudformation_cli_python_lib/recast.py
@@ -89,8 +89,8 @@ def _field_to_type(field: Any, key: str, classes: Dict[str, Any]) -> Any:  # noq
         possible_types = field.__args__
         if not possible_types:
             raise InvalidRequest(f"Cannot process type {field} for field {key}")
-    except AttributeError:
-        raise InvalidRequest(f"Cannot process type {field} for field {key}")
+    except AttributeError as ae:
+        raise InvalidRequest(f"Cannot process type {field} for field {key}") from ae
     # Assuming that the union is generated from typing.Optional, so only
     # contains one type and None
     # pylint: disable=unidiomatic-typecheck

diff --git a/tests/lib/interface_test.py b/tests/lib/interface_test.py
@@ -5,16 +5,15 @@
 
 import boto3
 import pytest
+import hypothesis.strategies as s
+from hypothesis import given
 from cloudformation_cli_python_lib.interface import (
     BaseModel,
     HandlerErrorCode,
     OperationStatus,
     ProgressEvent,
 )
 
-import hypothesis.strategies as s
-from hypothesis import given
-
 
 @pytest.fixture(scope="module")
 def client():

diff --git a/tests/lib/metrics_test.py b/tests/lib/metrics_test.py
@@ -5,15 +5,14 @@
 
 import boto3
 import pytest
+from botocore.stub import Stubber
 from cloudformation_cli_python_lib.interface import Action, MetricTypes, StandardUnit
 from cloudformation_cli_python_lib.metrics import (
     MetricPublisher,
     MetricsPublisherProxy,
     format_dimensions,
 )
 
-from botocore.stub import Stubber
-
 RESOURCE_TYPE = "Aa::Bb::Cc"
 NAMESPACE = MetricsPublisherProxy._make_namespace(  # pylint: disable=protected-access
     RESOURCE_TYPE

diff --git a/tests/lib/utils_test.py b/tests/lib/utils_test.py
@@ -3,6 +3,8 @@
 from unittest.mock import Mock, call, sentinel
 
 import pytest
+import hypothesis.strategies as s
+from hypothesis import given
 from cloudformation_cli_python_lib.exceptions import InvalidRequest
 from cloudformation_cli_python_lib.interface import BaseModel
 from cloudformation_cli_python_lib.utils import (
@@ -12,9 +14,6 @@
     deserialize_list,
 )
 
-import hypothesis.strategies as s
-from hypothesis import given
-
 
 def roundtrip(value):
     return json.loads(json.dumps(value, cls=KitchenSinkEncoder))