Merge remote-tracking branch 'upstream/main' into fix/bare-except-blocks

Author: Robbie-Palmer

end_to_end_tests/functional_tests/generated_code_execution/test_path_parameters.py

@@ -395,17 +395,19 @@ def _parse_nullable_model(data: object) -> ModelWithUnionProperty | None:
         else:
             an_optional_allof_enum = AnAllOfEnum(_an_optional_allof_enum)
 
-        nested_list_of_enums = []
         _nested_list_of_enums = d.pop("nested_list_of_enums", UNSET)
-        for nested_list_of_enums_item_data in _nested_list_of_enums or []:
-            nested_list_of_enums_item = []
-            _nested_list_of_enums_item = nested_list_of_enums_item_data
-            for nested_list_of_enums_item_item_data in _nested_list_of_enums_item:
-                nested_list_of_enums_item_item = DifferentEnum(nested_list_of_enums_item_item_data)
+        nested_list_of_enums: list[list[DifferentEnum]] | Unset = UNSET
+        if _nested_list_of_enums is not UNSET:
+            nested_list_of_enums = []
+            for nested_list_of_enums_item_data in _nested_list_of_enums:
+                nested_list_of_enums_item = []
+                _nested_list_of_enums_item = nested_list_of_enums_item_data
+                for nested_list_of_enums_item_item_data in _nested_list_of_enums_item:
+                    nested_list_of_enums_item_item = DifferentEnum(nested_list_of_enums_item_item_data)
 
-                nested_list_of_enums_item.append(nested_list_of_enums_item_item)
+                    nested_list_of_enums_item.append(nested_list_of_enums_item_item)
 
-            nested_list_of_enums.append(nested_list_of_enums_item)
+                nested_list_of_enums.append(nested_list_of_enums_item)
 
         _a_not_required_date = d.pop("a_not_required_date", UNSET)
         a_not_required_date: datetime.date | Unset

end_to_end_tests/golden-record/my_test_api_client/models/a_model.py

@@ -50,16 +50,18 @@ def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
         )
 
         d = dict(src_dict)
-        circular = []
         _circular = d.pop("circular", UNSET)
-        for componentsschemas_an_array_with_a_circular_ref_in_items_object_b_item_data in _circular or []:
-            componentsschemas_an_array_with_a_circular_ref_in_items_object_b_item = (
-                AnArrayWithACircularRefInItemsObjectBItem.from_dict(
-                    componentsschemas_an_array_with_a_circular_ref_in_items_object_b_item_data
+        circular: list[AnArrayWithACircularRefInItemsObjectBItem] | Unset = UNSET
+        if _circular is not UNSET:
+            circular = []
+            for componentsschemas_an_array_with_a_circular_ref_in_items_object_b_item_data in _circular:
+                componentsschemas_an_array_with_a_circular_ref_in_items_object_b_item = (
+                    AnArrayWithACircularRefInItemsObjectBItem.from_dict(
+                        componentsschemas_an_array_with_a_circular_ref_in_items_object_b_item_data
+                    )
                 )
-            )
 
-            circular.append(componentsschemas_an_array_with_a_circular_ref_in_items_object_b_item)
+                circular.append(componentsschemas_an_array_with_a_circular_ref_in_items_object_b_item)
 
         an_array_with_a_circular_ref_in_items_object_a_item = cls(
             circular=circular,

end_to_end_tests/golden-record/my_test_api_client/models/an_array_with_a_circular_ref_in_items_object_a_item.py

@@ -50,16 +50,18 @@ def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
         )
 
         d = dict(src_dict)
-        circular = []
         _circular = d.pop("circular", UNSET)
-        for componentsschemas_an_array_with_a_circular_ref_in_items_object_a_item_data in _circular or []:
-            componentsschemas_an_array_with_a_circular_ref_in_items_object_a_item = (
-                AnArrayWithACircularRefInItemsObjectAItem.from_dict(
-                    componentsschemas_an_array_with_a_circular_ref_in_items_object_a_item_data
+        circular: list[AnArrayWithACircularRefInItemsObjectAItem] | Unset = UNSET
+        if _circular is not UNSET:
+            circular = []
+            for componentsschemas_an_array_with_a_circular_ref_in_items_object_a_item_data in _circular:
+                componentsschemas_an_array_with_a_circular_ref_in_items_object_a_item = (
+                    AnArrayWithACircularRefInItemsObjectAItem.from_dict(
+                        componentsschemas_an_array_with_a_circular_ref_in_items_object_a_item_data
+                    )
                 )
-            )
 
-            circular.append(componentsschemas_an_array_with_a_circular_ref_in_items_object_a_item)
+                circular.append(componentsschemas_an_array_with_a_circular_ref_in_items_object_a_item)
 
         an_array_with_a_circular_ref_in_items_object_b_item = cls(
             circular=circular,

end_to_end_tests/golden-record/my_test_api_client/models/an_array_with_a_circular_ref_in_items_object_b_item.py

@@ -42,16 +42,18 @@ def to_dict(self) -> dict[str, Any]:
     @classmethod
     def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
         d = dict(src_dict)
-        recursive = []
         _recursive = d.pop("recursive", UNSET)
-        for componentsschemas_an_array_with_a_recursive_ref_in_items_object_item_data in _recursive or []:
-            componentsschemas_an_array_with_a_recursive_ref_in_items_object_item = (
-                AnArrayWithARecursiveRefInItemsObjectItem.from_dict(
-                    componentsschemas_an_array_with_a_recursive_ref_in_items_object_item_data
+        recursive: list[AnArrayWithARecursiveRefInItemsObjectItem] | Unset = UNSET
+        if _recursive is not UNSET:
+            recursive = []
+            for componentsschemas_an_array_with_a_recursive_ref_in_items_object_item_data in _recursive:
+                componentsschemas_an_array_with_a_recursive_ref_in_items_object_item = (
+                    AnArrayWithARecursiveRefInItemsObjectItem.from_dict(
+                        componentsschemas_an_array_with_a_recursive_ref_in_items_object_item_data
+                    )
                 )
-            )
 
-            recursive.append(componentsschemas_an_array_with_a_recursive_ref_in_items_object_item)
+                recursive.append(componentsschemas_an_array_with_a_recursive_ref_in_items_object_item)
 
         an_array_with_a_recursive_ref_in_items_object_item = cls(
             recursive=recursive,

end_to_end_tests/golden-record/my_test_api_client/models/an_array_with_a_recursive_ref_in_items_object_item.py

@@ -316,18 +316,20 @@ def _parse_some_nullable_number(data: object) -> float | None | Unset:
 
         some_nullable_number = _parse_some_nullable_number(d.pop("some_nullable_number", UNSET))
 
-        some_int_array = []
         _some_int_array = d.pop("some_int_array", UNSET)
-        for some_int_array_item_data in _some_int_array or []:
+        some_int_array: list[int | None] | Unset = UNSET
+        if _some_int_array is not UNSET:
+            some_int_array = []
+            for some_int_array_item_data in _some_int_array:
 
-            def _parse_some_int_array_item(data: object) -> int | None:
-                if data is None:
-                    return data
-                return cast(int | None, data)
+                def _parse_some_int_array_item(data: object) -> int | None:
+                    if data is None:
+                        return data
+                    return cast(int | None, data)
 
-            some_int_array_item = _parse_some_int_array_item(some_int_array_item_data)
+                some_int_array_item = _parse_some_int_array_item(some_int_array_item_data)
 
-            some_int_array.append(some_int_array_item)
+                some_int_array.append(some_int_array_item)
 
         def _parse_some_array(data: object) -> list[AFormData] | None | Unset:
             if data is None:

end_to_end_tests/golden-record/my_test_api_client/models/body_upload_file_tests_upload_post.py

@@ -402,17 +402,19 @@ def _parse_nullable_model(data: object) -> ModelWithUnionProperty | None:
         else:
             an_optional_allof_enum = AnAllOfEnum(_an_optional_allof_enum)
 
-        nested_list_of_enums = []
         _nested_list_of_enums = d.pop("nested_list_of_enums", UNSET)
-        for nested_list_of_enums_item_data in _nested_list_of_enums or []:
-            nested_list_of_enums_item = []
-            _nested_list_of_enums_item = nested_list_of_enums_item_data
-            for nested_list_of_enums_item_item_data in _nested_list_of_enums_item:
-                nested_list_of_enums_item_item = DifferentEnum(nested_list_of_enums_item_item_data)
+        nested_list_of_enums: list[list[DifferentEnum]] | Unset = UNSET
+        if _nested_list_of_enums is not UNSET:
+            nested_list_of_enums = []
+            for nested_list_of_enums_item_data in _nested_list_of_enums:
+                nested_list_of_enums_item = []
+                _nested_list_of_enums_item = nested_list_of_enums_item_data
+                for nested_list_of_enums_item_item_data in _nested_list_of_enums_item:
+                    nested_list_of_enums_item_item = DifferentEnum(nested_list_of_enums_item_item_data)
 
-                nested_list_of_enums_item.append(nested_list_of_enums_item_item)
+                    nested_list_of_enums_item.append(nested_list_of_enums_item_item)
 
-            nested_list_of_enums.append(nested_list_of_enums_item)
+                nested_list_of_enums.append(nested_list_of_enums_item)
 
         _a_not_required_date = d.pop("a_not_required_date", UNSET)
         a_not_required_date: datetime.date | Unset

end_to_end_tests/golden-record/my_test_api_client/models/extended.py

@@ -44,12 +44,14 @@ def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
         from ..models.validation_error import ValidationError
 
         d = dict(src_dict)
-        detail = []
         _detail = d.pop("detail", UNSET)
-        for detail_item_data in _detail or []:
-            detail_item = ValidationError.from_dict(detail_item_data)
+        detail: list[ValidationError] | Unset = UNSET
+        if _detail is not UNSET:
+            detail = []
+            for detail_item_data in _detail:
+                detail_item = ValidationError.from_dict(detail_item_data)
 
-            detail.append(detail_item)
+                detail.append(detail_item)
 
         http_validation_error = cls(
             detail=detail,

end_to_end_tests/golden-record/my_test_api_client/models/http_validation_error.py

@@ -86,17 +86,19 @@ def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
         else:
             an_optional_allof_enum = check_an_all_of_enum(_an_optional_allof_enum)
 
-        nested_list_of_enums = []
         _nested_list_of_enums = d.pop("nested_list_of_enums", UNSET)
-        for nested_list_of_enums_item_data in _nested_list_of_enums or []:
-            nested_list_of_enums_item = []
-            _nested_list_of_enums_item = nested_list_of_enums_item_data
-            for nested_list_of_enums_item_item_data in _nested_list_of_enums_item:
-                nested_list_of_enums_item_item = check_different_enum(nested_list_of_enums_item_item_data)
+        nested_list_of_enums: list[list[DifferentEnum]] | Unset = UNSET
+        if _nested_list_of_enums is not UNSET:
+            nested_list_of_enums = []
+            for nested_list_of_enums_item_data in _nested_list_of_enums:
+                nested_list_of_enums_item = []
+                _nested_list_of_enums_item = nested_list_of_enums_item_data
+                for nested_list_of_enums_item_item_data in _nested_list_of_enums_item:
+                    nested_list_of_enums_item_item = check_different_enum(nested_list_of_enums_item_item_data)
 
-                nested_list_of_enums_item.append(nested_list_of_enums_item_item)
+                    nested_list_of_enums_item.append(nested_list_of_enums_item_item)
 
-            nested_list_of_enums.append(nested_list_of_enums_item)
+                nested_list_of_enums.append(nested_list_of_enums_item)
 
         a_model = cls(
             an_enum_value=an_enum_value,